diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | common.mk | 7 | ||||
| -rw-r--r-- | win32/Makefile.sub | 26 |
3 files changed, 4 insertions, 39 deletions
diff --git a/Makefile.in b/Makefile.in index 953a839790..6891d90c79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -476,16 +476,6 @@ update-download:: update-config_files after-update:: prereq -update-mspec: - $(Q)$(CHDIR) $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline . - -update-rubyspec: update-mspec - $(Q) echo ruby/spec is now in the MRI repository and make update-rubyspec has no effect - $(Q)$(CHDIR) $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline . - -test-rubyspec-precheck: - @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi - update-doclie: $(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/coverage $(Q1:0=-q) \ --branch $(DOCLIE_GIT_REF) \ @@ -709,10 +709,10 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h test-rubyspec-precheck: $(arch)-fake.rb test-rubyspec: $(TEST_RUNNABLE)-test-rubyspec -yes-test-rubyspec: test-rubyspec-precheck +yes-test-rubyspec: $(gnumake_recursive)$(Q) \ $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) -no-test-rubyspec: test-rubyspec-precheck +no-test-rubyspec: RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY @@ -1079,7 +1079,8 @@ after-update:: extract-extlibs update-remote:: update-src update-download update-download:: update-unicode update-gems download-extlibs -noupdate-rubyspec: +update-mspec: +update-rubyspec: update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6b74a772f6..f3559fb006 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -487,32 +487,6 @@ $(SCRIPTPROGRAMS): $(STUBPROGRAM) update-src:: @cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP) -update-mspec: -!if exist($(srcdir)/spec/mspec) - @echo updating mspec ... - @cd $(srcdir:/=\)\spec\mspec && git pull -!else - @echo retrieving mspec ... - @cd $(srcdir:/=\) && git clone $(MSPEC_GIT_URL) spec/mspec -!endif - @cd $(srcdir:/=\)\spec\mspec && git --no-pager log -1 --oneline - -update-rubyspec: update-mspec -!if exist($(srcdir)/spec/rubyspec) - @echo updating rubyspec ... - @cd $(srcdir:/=\)\spec\rubyspec && git pull -!else - @echo retrieving rubyspec ... - @cd $(srcdir:/=\) && git clone $(RUBYSPEC_GIT_URL) spec/rubyspec -!endif - @cd $(srcdir:/=\)\spec\rubyspec && git --no-pager log -1 --oneline - -test-rubyspec-precheck: -!if !exist($(srcdir)/spec/rubyspec/.) - @echo No rubyspec here. make update-rubyspec first. - @exit 1 -!endif - $(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \ $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat \ $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak \ |