[前][次][番号順一覧][スレッド一覧]

ruby-changes:46478

From: eregon <ko1@a...>
Date: Sun, 7 May 2017 21:01:30 +0900 (JST)
Subject: [ruby-changes:46478] eregon:r58594 (trunk): make update-rubyspec is no longer needed

eregon	2017-05-07 21:01:26 +0900 (Sun, 07 May 2017)

  New Revision: 58594

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58594

  Log:
    make update-rubyspec is no longer needed
    
    * Kept a no-op for compatibility.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 58593)
+++ common.mk	(revision 58594)
@@ -1076,7 +1076,7 @@ up:: https://github.com/ruby/ruby/blob/trunk/common.mk#L1076
 
 after-update:: extract-extlibs
 
-update-remote:: update-src update-download $(HAVE_GIT:yes=)update-rubyspec
+update-remote:: update-src update-download
 update-download:: update-unicode update-gems download-extlibs
 
 noupdate-rubyspec:
@@ -1265,7 +1265,6 @@ help: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1265
 	"  test-all:        all ruby tests [TESTOPTS=-j4 TESTS=\"<test files>\"]" \
 	"  test-rubyspec:   run the Ruby spec suite" \
 	"  up:              update local copy and autogenerated files" \
-	"  update-rubyspec: update local copy of the Ruby spec suite" \
 	"  benchmark:       benchmark this ruby and COMPARE_RUBY." \
 	"  gcbench:         gc benchmark [GCBENCH_ITEM=<item_name>]" \
 	"  gcbench-rdoc:    gc benchmark with GCBENCH_ITEM=rdoc" \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 58593)
+++ Makefile.in	(revision 58594)
@@ -477,14 +477,11 @@ update-download:: update-config_files https://github.com/ruby/ruby/blob/trunk/Makefile.in#L477
 after-update:: prereq
 
 update-mspec:
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/spec $(Q1:0=-q) \
-		$(MSPEC_GIT_URL) mspec $(GIT_OPTS)
-	$(Q)$(CHDIR) $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline
+	$(Q)$(CHDIR) $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline .
 
 update-rubyspec: update-mspec
-	$(Q) $(srcdir)/tool/git-refresh -C $(srcdir)/spec $(Q1:0=-q) \
-		$(RUBYSPEC_GIT_URL) rubyspec $(GIT_OPTS)
-	$(Q)$(CHDIR) $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
+	$(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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]