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

make-snapshot: override rest variables

Browse source 
* tool/make-snapshot (package): override variables which are not
  substituted by the command line.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-03-25 07:44:58 +00:00
parent cfa98ab2eb
commit 8d43213467
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tool/make-snapshot
View file

@ -308,7 +308,8 @@ def package(vcs, rev, destdir, tmp = nil)
"PWD"=>Dir.pwd, "PWD"=>Dir.pwd,
"CONFIGURE"=>"configure", "CONFIGURE"=>"configure",
} }
mk.gsub!(/@([A-Za-z_]\w*)@/) {vars[$1] || ENV[$1]} args = vars.dup
mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "") mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
mk << <<-'APPEND' mk << <<-'APPEND'
@ -320,7 +321,7 @@ extract-gems:
open(clean.add("Makefile"), "w") do |f| open(clean.add("Makefile"), "w") do |f|
f.puts mk f.puts mk
end end
system("make", "prereq") system("make", "prereq", *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