ruby-changes:41514
From: nobu <ko1@a...>
Date: Tue, 19 Jan 2016 14:05:13 +0900 (JST)
Subject: [ruby-changes:41514] nobu:r53588 (trunk): make-snapshot: download first
nobu 2016-01-19 14:05:47 +0900 (Tue, 19 Jan 2016) New Revision: 53588 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53588 Log: make-snapshot: download first * common.mk (update-download): split to download only, excluding VCS. * make-snapshot: download config, Unicode data, gem, and external library files first. Modified files: trunk/common.mk trunk/tool/make-snapshot Index: common.mk =================================================================== --- common.mk (revision 53587) +++ common.mk (revision 53588) @@ -973,7 +973,8 @@ up:: https://github.com/ruby/ruby/blob/trunk/common.mk#L973 after-update:: extract-extlibs -update-remote:: update-src update-rubyspec update-config_files update-unicode update-gems +update-remote:: update-src update-rubyspec update-download +update-download:: update-config_files update-unicode update-gems download-extlibs update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \ Index: tool/make-snapshot =================================================================== --- tool/make-snapshot (revision 53587) +++ tool/make-snapshot (revision 53588) @@ -187,7 +187,7 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L187 return end if $srcdir - Dir.glob($srcdir + "/{tool/config.{guess,sub},gems/*.gem,.downloaded-cache/*}") do |file| + Dir.glob($srcdir + "/{tool/config.{guess,sub},gems/*.gem,.downloaded-cache/*,enc/unicode/data/**/*.txt}") do |file| puts "copying #{file}" dest = exported + file[$srcdir.size..-1] FileUtils.mkpath(File.dirname(dest)) @@ -315,10 +315,13 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L315 prereq: clean-cache $(CLEAN_CACHE) clean-cache $(CLEAN_CACHE): after-update +update-download:: update-gems after-update:: extract-gems -extract-gems: +extract-gems: update-gems +update-gems: APPEND open(clean.add("Makefile"), "w") do |f| + f.puts "prereq: update-download" f.puts mk end system("make", "prereq", *args.map {|arg| arg.join("=")}) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/