summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 09:42:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 09:42:33 +0000
commitafba32494c492a70132550278ffa495a10541c9a (patch)
treef4d6ea9b843c4cfee003c780a280b1ca1e63ba01
parent99e9aca09622bdfc67143205754744a877ff7c4d (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/make-snapshot9
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c42d2a2d7..b9c97c0fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 16 18:43:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* include/ruby/ruby.h (VALUE): use unsigned long or long long
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 1f6624278d..13e437b20e 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -19,7 +19,9 @@ YACC = ENV["YACC"] ||= "bison"
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 @@ 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}'", "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 @@ def package(rev, destdir)
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"],