From aeec60621a5d0882d4b9864327a0b5bd49447f17 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 8 Dec 2008 15:54:05 +0000 Subject: [PATCH] * tool/make-snapshot (package): enc.mk in snapshot is dummy and should not deal with objects. [ruby-core:20422] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/make-snapshot | 8 ++++++++ 2 files changed, 13 insertions(+) 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 + + * 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 * 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