1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make-snapshot: get rid of circular dependency

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-01-18 09:31:32 +00:00
parent c4e832bf6f
commit 17aeff3e77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool/make-snapshot
View File

@ -408,7 +408,7 @@ def package(vcs, rev, destdir, tmp = nil)
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "") mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
mk << <<-'APPEND' mk << <<-'APPEND'
prereq: clean-cache $(CLEAN_CACHE) prepare-package: prereq update-download clean-cache $(CLEAN_CACHE)
clean-cache $(CLEAN_CACHE): after-update clean-cache $(CLEAN_CACHE): after-update
touch-unicode-files: _touch-unicode-files touch-unicode-files: _touch-unicode-files
update-download:: touch-unicode-files update-download:: touch-unicode-files
@ -421,11 +421,10 @@ _touch-unicode-files:
touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS) touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS)
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
ENV["CACHE_SAVE"] = "no" ENV["CACHE_SAVE"] = "no"
system(ENV["MAKE"] || ENV["make"] || "make", "prereq", *args.map {|arg| arg.join("=")}) system(ENV["MAKE"] || ENV["make"] || "make", "prepare-package", *args.map {|arg| arg.join("=")})
clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk") clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk")
print "prerequisites" print "prerequisites"
else else