ruby-changes:10063
From: nobu <ko1@a...>
Date: Fri, 16 Jan 2009 18:42:49 +0900 (JST)
Subject: [ruby-changes:10063] Ruby:r21606 (trunk): * tool/make-snapshot (package): includes all rules and expand
nobu 2009-01-16 18:42:33 +0900 (Fri, 16 Jan 2009) New Revision: 21606 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21606 Log: * tool/make-snapshot (package): includes all rules and expand configured values from the environment to create *.inc, sets RM for ripper.c, and needs chdir if absolute path is given with -exported option. Modified files: trunk/ChangeLog trunk/tool/make-snapshot Index: ChangeLog =================================================================== --- ChangeLog (revision 21605) +++ ChangeLog (revision 21606) @@ -1,3 +1,10 @@ +Fri Jan 16 18:43:30 2009 Nobuyoshi Nakada <nobu@r...> + + * tool/make-snapshot (package): includes all rules and expand + configured values from the environment to create *.inc, sets RM + for ripper.c, and needs chdir if absolute path is given with + -exported option. + Fri Jan 16 18:26:47 2009 Nobuyoshi Nakada <nobu@r...> * include/ruby/ruby.h (VALUE): use unsigned long or long long Index: tool/make-snapshot =================================================================== --- tool/make-snapshot (revision 21605) +++ tool/make-snapshot (revision 21606) @@ -19,7 +19,9 @@ ENV["BASERUBY"] ||= "ruby" ENV["RUBY"] ||= "ruby" ENV["MV"] ||= "mv" +ENV["RM"] ||= "rm -f" ENV["MINIRUBY"] ||= "ruby" +ENV["PROGRAM"] ||= "ruby" class String # for older ruby @@ -157,8 +159,8 @@ 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}'", "w") do |f| - f.puts(IO.read("Makefile.in")[/^lex\.c.*?^$/m]) + IO.popen("make -f - prereq srcdir=. 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 File.open("enc.mk", "r+b") do |f| @@ -185,6 +187,9 @@ if v == "." v = File.basename(Dir.pwd) Dir.chdir ".." + else + Dir.chdir(File.dirname(v)) + v = File.basename(v) end return [["bzip tarball", ".tar.bz2", %w"tar cjf"], -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/