From 2f7f34f10702c8afded1846415fb3e6ee6fc0848 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Jan 2009 05:32:43 +0000 Subject: [PATCH] * tool/make-snapshot (prereq): remove enc.mk from tarball because BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/make-snapshot | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d38b3dae48..f8136ea543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 30 14:31:14 2009 NAKAMURA Usaku + + * tool/make-snapshot (prereq): remove enc.mk from tarball because + BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk. + Fri Jan 30 14:11:48 2009 NAKAMURA Usaku * enc/depend: extract comile rules to each target for VC++. diff --git a/tool/make-snapshot b/tool/make-snapshot index 13e437b20e..6f564a62ee 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -163,15 +163,7 @@ def package(rev, destdir) 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| - 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") + clean.push("rbconfig.rb", ".rbconfig.time", "enc.mk") print "prerequisites" else system("#{YACC} -o parse.c parse.y")