diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:33:41 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:33:41 +0000 |
commit | 0a0206cebc31b8a3773feb451927d83c781dc1bf (patch) | |
tree | 8a52454d52a2c75515b63fe66b73e80bb775e095 | |
parent | 4555b0130044bca4fc43a08aa83a5e588da05882 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | tool/make-snapshot | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -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 |