ruby-changes:11583
From: yugui <ko1@a...>
Date: Sun, 19 Apr 2009 22:34:20 +0900 (JST)
Subject: [ruby-changes:11583] Ruby:r23220 (ruby_1_9_1): merges r22995 from trunk into ruby_1_9_1.
yugui 2009-04-19 22:33:41 +0900 (Sun, 19 Apr 2009) New Revision: 23220 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23220 Log: merges r22995 from trunk into ruby_1_9_1. -- * tool/make-snapshot (package): creates .revision.time and passes CHDIR to create prerequisite files. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/tool/make-snapshot Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23219) +++ ruby_1_9_1/ChangeLog (revision 23220) @@ -1,3 +1,8 @@ +Tue Mar 17 21:42:54 2009 Nobuyoshi Nakada <nobu@r...> + + * tool/make-snapshot (package): creates .revision.time and passes + CHDIR to create prerequisite files. + Tue Mar 17 18:00:55 2009 Akinori MUSHA <knu@i...> * enumerator.c (Enumerator#{each_,}{with_index,with_object}): Fix Index: ruby_1_9_1/tool/make-snapshot =================================================================== --- ruby_1_9_1/tool/make-snapshot (revision 23219) +++ ruby_1_9_1/tool/make-snapshot (revision 23220) @@ -108,6 +108,7 @@ 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 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/