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: follow previous commits

Browse source 
* tool/make-snapshot (package): set @ruby_version@ and
  BOOTSTRAPRUBY.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-03-07 11:54:58 +00:00
parent 0581320a59
commit 9833ae93cf
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tool/make-snapshot
View file

@ -279,7 +279,7 @@ def package(vcs, rev, destdir, tmp = nil)
f.puts "s,@CP@,|#_!!_#|cp,g" f.puts "s,@CP@,|#_!!_#|cp,g"
f.puts "s,@rubyarchdir@,|#_!!_#|,g" f.puts "s,@rubyarchdir@,|#_!!_#|,g"
f.puts "s,@rubylibprefix@,|#_!!_#|,g" f.puts "s,@rubylibprefix@,|#_!!_#|,g"
f.puts "s,@ruby_version@,|#_!!_#|,g" f.puts "s,@ruby_version@,|#_!!_#|#{version},g"
} }
FileUtils.mkpath(hdrdir = "#{extout}/include/ruby") FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
File.open("#{hdrdir}/config.h", "w") {} File.open("#{hdrdir}/config.h", "w") {}
@ -287,6 +287,7 @@ def package(vcs, rev, destdir, tmp = nil)
File.open("#{defaults}/operating_system.rb", "w") {} File.open("#{defaults}/operating_system.rb", "w") {}
File.open("#{defaults}/ruby.rb", "w") {} File.open("#{defaults}/ruby.rb", "w") {}
miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross" miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
baseruby = ENV["BASERUBY"]
mk = IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]} mk = IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]}
mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "") mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
cmd = %W[make -f - cmd = %W[make -f -
@ -298,7 +299,8 @@ def package(vcs, rev, destdir, tmp = nil)
RUNRUBY=#{miniruby} RUNRUBY=#{miniruby}
RUBY=#{ENV["RUBY"]} RUBY=#{ENV["RUBY"]}
HAVE_BASERUBY=yes HAVE_BASERUBY=yes
BASERUBY=#{ENV["BASERUBY"]} BASERUBY=#{baseruby}
BOOTSTRAPRUBY=#{baseruby}
PWD=#{Dir.pwd} PWD=#{Dir.pwd}
prereq] prereq]
IO.popen(cmd, "w") do |f| IO.popen(cmd, "w") do |f|
@ -312,7 +314,7 @@ def package(vcs, rev, destdir, tmp = nil)
system(*%W"#{YACC} -o parse.c parse.y") system(*%W"#{YACC} -o parse.c parse.y")
end end
vcs.after_export(".") if exported vcs.after_export(".") if exported
FileUtils.rm_rf(clean) FileUtils.rm_rf(clean) unless $keep_temp
FileUtils.rm_rf(".downloaded-cache") FileUtils.rm_rf(".downloaded-cache")
if File.exist?("gems/bundled_gems") if File.exist?("gems/bundled_gems")
gems = Dir.glob("gems/*.gem") gems = Dir.glob("gems/*.gem")