summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-17 12:42:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-17 12:42:56 +0000
commit39dfe919094c76461865196a7444ca4e76a46251 (patch)
tree4ee1388481107c085afa814dd091e98d3ca1221f
parent616932fbdb0b788fab113439276965fafcd70ea7 (diff)
* tool/make-snapshot (package): creates .revision.time and passes
CHDIR to create prerequisite files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/make-snapshot3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 372bd2195b..8fd16f295d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 17 21:42:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/make-snapshot (package): creates .revision.time and passes
+ CHDIR to create prerequisite files.
+
Tue Mar 17 18:00:55 2009 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 6f564a62ee..45b6c51efc 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