summaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-19 13:33:41 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-19 13:33:41 +0000
commit09ca675a4775d9efcbcb5650f53f471e6914a0a4 (patch)
tree8a52454d52a2c75515b63fe66b73e80bb775e095 /tool
parentea427bf41b9a97a0b9b9b28b0a16cff7eea99c69 (diff)
downloadruby-09ca675a4775d9efcbcb5650f53f471e6914a0a4.tar.gz
ruby-09ca675a4775d9efcbcb5650f53f471e6914a0a4.tar.xz
ruby-09ca675a4775d9efcbcb5650f53f471e6914a0a4.zip
merges r22995 from trunk into ruby_1_9_1.
-- * tool/make-snapshot (package): creates .revision.time and passes CHDIR to create prerequisite files. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/make-snapshot3
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 6f564a62e..45b6c51ef 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -108,6 +108,7 @@ def package(rev, destdir)
v = v[0]
end
open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}
+ open("#{v}/.revision.time", "wb") {}
version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
version or return
if patchlevel
@@ -159,7 +160,7 @@ def package(rev, destdir)
FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
File.open("#{hdrdir}/config.h", "w") {}
miniruby = ENV['MINIRUBY'] + " -rcross"
- IO.popen("make -f - prereq srcdir=. IFCHANGE=tool/ifchange 'MINIRUBY=#{miniruby}' 'RUBY=#{ENV["RUBY"]}'", "w") do |f|
+ IO.popen("make -f - prereq srcdir=. CHDIR=cd IFCHANGE=tool/ifchange 'MINIRUBY=#{miniruby}' 'RUBY=#{ENV["RUBY"]}'", "w") do |f|
f.puts(IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]})
f.puts(commonmk.gsub(/\{[^{}]*\}/, ""))
end