[macruby-changes] [3930] MacRuby/trunk/bin/ruby_deploy

[source_changes at macosforge.org]

Revision: 3930
          http://trac.macosforge.org/projects/ruby/changeset/3930
Author:   lsansonetti at apple.com
Date:     2010-04-14 02:08:00 -0700 (Wed, 14 Apr 2010)
Log Message:
-----------
backport r3929 into trunk

Revision Links:
--------------
    http://trac.macosforge.org/projects/ruby/changeset/3929

Modified Paths:
--------------
    MacRuby/trunk/bin/ruby_deploy

Modified: MacRuby/trunk/bin/ruby_deploy
===================================================================
--- MacRuby/trunk/bin/ruby_deploy	2010-04-14 06:19:10 UTC (rev 3929)
+++ MacRuby/trunk/bin/ruby_deploy	2010-04-14 09:08:00 UTC (rev 3930)
@@ -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/20100414/3b74e6fb/attachment.html>