diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 11:44:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 11:44:41 +0000 |
| commit | e3707541890c1d679b8bc8e319980667e6ed2bd6 (patch) | |
| tree | 24a5bc95346529242e514e15408f499133d03cde /Makefile.in | |
| parent | b49106dfd76d9db5cf34f795f8c89639f40e9b2f (diff) | |
Improved compatibility for mspec.
* Makefile.in (update-rubyspec): renamed the rubyspec directory
"spec". Changed directory structure.
* Makefile.in (test-rubyspec): ditto.
* spec/README: described the structure of "spec" directory.
* spec/default.mspec: configured for Matz's Ruby Implementation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index f239b7941c..29a648c9a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -208,18 +208,20 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c update-rubyspec: - if [ -d $(srcdir)/rubyspec ]; then \ - cd $(srcdir)/rubyspec/mspec; \ + if [ -d $(srcdir)/spec/mspec ]; then \ + cd $(srcdir)/spec/mspec; \ git pull; \ - cd ../spec/rubyspec; \ + cd ../..; \ + else \ + git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \ + fi + if [ -d $(srcdir)/spec/rubyspec ]; then \ + cd $(srcdir)/spec/rubyspec; \ git pull; \ else \ - mkdir $(srcdir)/rubyspec; \ - mkdir $(srcdir)/rubyspec/spec; \ - git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \ - git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \ + git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \ fi test-rubyspec: - @if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi - $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR) + @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi + $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(srcdir)/spec/rubyspec/$(MAJOR).$(MINOR) |