1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-01-19 05:05:47 +00:00
parent 866ac8d91c
commit fe20002cb5
2 changed files with 7 additions and 3 deletions

View file

@ -973,7 +973,8 @@ up::
after-update:: extract-extlibs 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 update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)/tool" \ $(Q) $(BASERUBY) -C "$(srcdir)/tool" \

View file

@ -187,7 +187,7 @@ def package(vcs, rev, destdir, tmp = nil)
return return
end end
if $srcdir 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}" puts "copying #{file}"
dest = exported + file[$srcdir.size..-1] dest = exported + file[$srcdir.size..-1]
FileUtils.mkpath(File.dirname(dest)) FileUtils.mkpath(File.dirname(dest))
@ -315,10 +315,13 @@ def package(vcs, rev, destdir, tmp = nil)
prereq: clean-cache $(CLEAN_CACHE) prereq: clean-cache $(CLEAN_CACHE)
clean-cache $(CLEAN_CACHE): after-update clean-cache $(CLEAN_CACHE): after-update
update-download:: update-gems
after-update:: extract-gems after-update:: extract-gems
extract-gems: extract-gems: update-gems
update-gems:
APPEND APPEND
open(clean.add("Makefile"), "w") do |f| open(clean.add("Makefile"), "w") do |f|
f.puts "prereq: update-download"
f.puts mk f.puts mk
end end
system("make", "prereq", *args.map {|arg| arg.join("=")}) system("make", "prereq", *args.map {|arg| arg.join("=")})