[macruby-changes] [832] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 832
          http://trac.macosforge.org/projects/ruby/changeset/832
Author:   lsansonetti at apple.com
Date:     2009-03-02 14:06:19 -0800 (Mon, 02 Mar 2009)
Log Message:
-----------
let's disable the GC using the environment variable, since GC.disable is not reliable

Modified Paths:
--------------
    MacRuby/trunk/Rakefile
    MacRuby/trunk/ext/extmk.rb
    MacRuby/trunk/instruby.rb

Modified: MacRuby/trunk/Rakefile
===================================================================
--- MacRuby/trunk/Rakefile	2009-03-02 22:05:53 UTC (rev 831)
+++ MacRuby/trunk/Rakefile	2009-03-02 22:06:19 UTC (rev 832)
@@ -584,7 +584,7 @@
 
 desc "Build extensions"
 task :extensions => [:miniruby, "macruby:static"] do
-  sh "./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS}"
+  sh "GC_DISABLE=1 ./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS}"
 end
 
 namespace :framework do
@@ -627,7 +627,7 @@
 
   desc "Install the framework"
   task :install => :info_plist do
-    sh "./miniruby instruby.rb #{INSTRUBY_ARGS}"
+    sh "GC_DISABLE=1 ./miniruby instruby.rb #{INSTRUBY_ARGS}"
   end
 end
 

Modified: MacRuby/trunk/ext/extmk.rb
===================================================================
--- MacRuby/trunk/ext/extmk.rb	2009-03-02 22:05:53 UTC (rev 831)
+++ MacRuby/trunk/ext/extmk.rb	2009-03-02 22:06:19 UTC (rev 832)
@@ -1,8 +1,6 @@
 #! /usr/local/bin/ruby
 # -*- ruby -*-
 
-GC.disable # XXX for now
-
 $extension = nil
 $extstatic = nil
 $force_static = nil

Modified: MacRuby/trunk/instruby.rb
===================================================================
--- MacRuby/trunk/instruby.rb	2009-03-02 22:05:53 UTC (rev 831)
+++ MacRuby/trunk/instruby.rb	2009-03-02 22:06:19 UTC (rev 832)
@@ -1,7 +1,5 @@
 #!./miniruby
 
-GC.disable # XXX for now
-
 load "./rbconfig.rb"
 include RbConfig
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090302/aaebc491/attachment.html>