summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-19 05:05:47 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-19 05:05:47 (GMT)
commitfe20002cb5103fef217597d837c26472d00ff3c6 (patch)
tree5128f615b11d1387fce4b8d93939e6d76e170297
parent866ac8d91c03d04691c87a71f33770a145b2984a (diff)
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
-rw-r--r--common.mk3
-rwxr-xr-xtool/make-snapshot7
2 files changed, 7 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 5c28378..6f095b0 100644
--- a/common.mk
+++ b/common.mk
@@ -973,7 +973,8 @@ up::
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" \
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 865fdeb..d52e06f 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -187,7 +187,7 @@ def package(vcs, rev, destdir, tmp = nil)
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)
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("=")})