yugui	2008-12-12 23:54:16 +0900 (Fri, 12 Dec 2008)

  New Revision: 20675

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20675

  Log:
    merges r20583 from trunk into ruby_1_9_1.
    * tool/make-snapshot (package): enc.mk in snapshot is dummy and should
      not deal with objects.  [ruby-core:20422]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/tool/make-snapshot

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20674)
+++ ruby_1_9_1/ChangeLog	(revision 20675)
@@ -1,3 +1,8 @@
+Tue Dec  9 00:54:01 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* enc/depend (clean-srcs): split out from clean.
Index: ruby_1_9_1/tool/make-snapshot
===================================================================
--- ruby_1_9_1/tool/make-snapshot	(revision 20674)
+++ ruby_1_9_1/tool/make-snapshot	(revision 20675)
@@ -161,6 +161,14 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/