summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/make-snapshot8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1baae06e45..b8bbd07208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 9 00:54:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/make-snapshot (package): enc.mk in snapshot is dummy and should
+ not deal with objects. [ruby-core:20422]
+
Tue Dec 9 00:17:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/depend (clean-srcs): split out from clean.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 7b257f3d1b..1f6624278d 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -161,6 +161,14 @@ def package(rev, destdir)
f.puts(IO.read("Makefile.in")[/^lex\.c.*?^$/m])
f.puts(commonmk.gsub(/\{[^{}]*\}/, ""))
end
+ File.open("enc.mk", "r+b") do |f|
+ data = f.read
+ data.gsub!(/^((?:ENC|TRANS)(?:OBJ|SO)(?:S|DIR)\s*=)(?:.*\\\n)*.*/, '\1')
+ data.sub!(/^(clean:.*)(?:\n\t.*)+/, '\1')
+ f.rewind
+ f.truncate(0)
+ f.print data
+ end
clean.push("rbconfig.rb", ".rbconfig.time")
print "prerequisites"
else