Fixed Makefile dependency bug. Added makefile dependency reading perf…

…ormance patch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@670 5af023f1-ac1a-0410-98d6-829a145c37ef

.#dep.patch

@@ -0,0 +1 @@
+jim@tardis.local.125

CHANGES

@@ -18,7 +18,7 @@
   Emanuel Inderm�hle)
 
 * Switched from getoptlong to optparse (patches supplied by Edwin
-  Pratomo (edpratomo@yahoo.co.id))
+  Pratomo)
 
 * The -T option will now attempt to dynamically sense the size of the
   terminal.  RAKE_COLUMNS will override any dynamic sensing.
@@ -35,7 +35,14 @@
   easier for the tempate to pick up the template from the environment.
 
 * Changed from using Mutex to Monitor. Evidently Mutex causes thread
-  join errors when Ruby is compiled with -disable-pthreads.
+  join errors when Ruby is compiled with -disable-pthreads. (Patch
+  supplied by Ittay Dror) 
+
+* Fixed bug in makefile parser that had problems with extra spaces in
+  file task names. (Patch supplied by Ittay Dror)
+
+* Added a performance patch for reading large makefile dependency
+  files. (Patch supplied by Ittay Dror)
 
 == Version 0.8.1
 

dep.patch

@@ -0,0 +1,23 @@
+--- rake/loaders/makefile.rb.orig    2008-07-22 19:01:11.000000000 +0300
++++ rake/loaders/makefile.rb    2008-07-22 19:27:03.000000000 +0300
+@@ -9,16 +9,10 @@
+   def load(fn)
+     buffer = ''
+     open(fn) do |mf|
+-        mf.each do |line|
+-          next if line =~ /^\s*#/
+-          buffer << line
+-          if buffer =~ /\\$/
+-            buffer.sub!(/\\\n/, ' ')
+-            state = :append
+-          else
+-            process_line(buffer)
+-            buffer = ''
+-          end
++        lines = mf.read
++    lines.gsub!(/\\\n/, ' ')
++        lines.split("\n").each do |line|
++          process_line line
+       end
+     end
+     process_line(buffer) if buffer != ''

lib/rake/loaders/makefile.rb

@@ -7,21 +7,14 @@ class MakefileLoader
 
     # Load the makefile dependencies in +fn+.
     def load(fn)
-      buffer = ''
       open(fn) do |mf|
-        mf.each do |line|
-          next if line =~ /^\s*#/
-          buffer << line
-          if buffer =~ /\\$/
-            buffer.sub!(/\\\n/, ' ')
-            state = :append
-          else
-            process_line(buffer)
-            buffer = ''
-          end
+        lines = mf.read
+        lines.gsub!(/#[^\n]*\n/m, "")
+        lines.gsub!(/\\\n/, ' ')
+        lines.split("\n").each do |line|
+          process_line(line)
         end
       end
-      process_line(buffer) if buffer != ''
     end
 
     private
@@ -30,6 +23,7 @@ def load(fn)
     def process_line(line)
       file_task, args = line.split(':')
       return if args.nil?
+      file_task.strip!
       dependents = args.split
       file file_task => dependents
     end

test/data/sample.mf

@@ -4,6 +4,7 @@ b: b1 b2 b3 \
    b4 b5 b6\
 # Mid: Comment
 b7
-a: a5 a6 a7
+
+ a : a5 a6 a7
 c: c1
 d: d1 d2 \

test/test_makefile_loader.rb

@@ -7,7 +7,7 @@
 class TestMakefileLoader < Test::Unit::TestCase
   include Rake
 
-  def test_create
+  def test_parse
     Task.clear
     loader = Rake::MakefileLoader.new
     loader.load("test/data/sample.mf")