[macruby-changes] [3929] MacRuby/branches/vm-mcache/bin/ruby_deploy

[source_changes at macosforge.org]

Revision: 3929
          http://trac.macosforge.org/projects/ruby/changeset/3929
Author:   lsansonetti at apple.com
Date:     2010-04-13 23:19:10 -0700 (Tue, 13 Apr 2010)
Log Message:
-----------
do not include stdlib files for compilation and spawn macrubyc from the current ruby's bindir

Modified Paths:
--------------
    MacRuby/branches/vm-mcache/bin/ruby_deploy

Modified: MacRuby/branches/vm-mcache/bin/ruby_deploy
===================================================================
--- MacRuby/branches/vm-mcache/bin/ruby_deploy	2010-04-14 03:35:11 UTC (rev 3928)
+++ MacRuby/branches/vm-mcache/bin/ruby_deploy	2010-04-14 06:19:10 UTC (rev 3929)
@@ -83,17 +83,18 @@
   end
 
   def compile_files
-    Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) +
-      Dir.glob(File.join(app_macruby_usr, '**/*.rb'))
+    Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb'))
   end
 
+  MACRUBYC = File.join(RbConfig::CONFIG['bindir'], 'macrubyc')
+
   def compile
     compile_files.each do |source|
       base = File.basename(source, '.rb')
       next if base == 'rb_main'
       obj = File.join(File.dirname(source), base + '.rbo')
       if !File.exist?(obj) or File.mtime(source) > File.mtime(obj)
-        compile_cmd = "macrubyc -C \"#{source}\" -o \"#{obj}\""
+        compile_cmd = "#{MACRUBYC} -C \"#{source}\" -o \"#{obj}\""
         # Use Xcode ARCHS env var to determine which archs to compile for
         compile_cmd += ENV['ARCHS'].strip.split.map { |a| " -a #{a}" }.join if ENV['ARCHS']
         execute(compile_cmd, "Can't compile \"#{source}\"")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100413/cbecae30/attachment.html>