summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-30 05:32:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-30 05:32:43 +0000
commitc8ba12023249e2410910b3852d06eb1d956a0f48 (patch)
treef11eac988a0eec43ea514ecbc0aa94429ae2ff5c
parent6539c7176328f8609284981d65bacc3def1b6111 (diff)
downloadruby-c8ba12023249e2410910b3852d06eb1d956a0f48.tar.gz
ruby-c8ba12023249e2410910b3852d06eb1d956a0f48.tar.xz
ruby-c8ba12023249e2410910b3852d06eb1d956a0f48.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@21893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/make-snapshot10
2 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index d38b3dae4..f8136ea54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 30 14:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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 <usa@ruby-lang.org>
* enc/depend: extract comile rules to each target for VC++.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 13e437b20..6f564a62e 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")