[macruby-changes] [5305] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 5305
          http://trac.macosforge.org/projects/ruby/changeset/5305
Author:   lsansonetti at apple.com
Date:     2011-03-24 14:32:23 -0700 (Thu, 24 Mar 2011)
Log Message:
-----------
fix a bug in the build system when some header files would not be located (patch by kouji at takao7.net)

Modified Paths:
--------------
    MacRuby/trunk/rakelib/builder/builder.rb
    MacRuby/trunk/vm.cpp

Modified: MacRuby/trunk/rakelib/builder/builder.rb
===================================================================
--- MacRuby/trunk/rakelib/builder/builder.rb	2011-03-24 01:11:08 UTC (rev 5304)
+++ MacRuby/trunk/rakelib/builder/builder.rb	2011-03-24 21:32:23 UTC (rev 5305)
@@ -146,7 +146,7 @@
   
   def locate_headers(cont, src)
     txt = File.read(src)
-    txt.scan(/#include\s+\"([^"]+)\"/).flatten.each do |header|
+    txt.scan(/#\s*include\s+\"([^"]+)\"/).flatten.each do |header|
       p = header_path(header)
       if p and !cont.include?(p)
         cont << p

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2011-03-24 01:11:08 UTC (rev 5304)
+++ MacRuby/trunk/vm.cpp	2011-03-24 21:32:23 UTC (rev 5305)
@@ -4914,7 +4914,7 @@
 #endif
 
 #if !defined(MACRUBY_STATIC)
-# include "./.objs/kernel_data.c"
+# include ".objs/kernel_data.c"
 #endif
 
 extern "C"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110324/68dc8226/attachment.html>