[macruby-changes] [695] MacRuby/trunk/Rakefile

[source_changes at macosforge.org]

Revision: 695
          http://trac.macosforge.org/projects/ruby/changeset/695
Author:   lsansonetti at apple.com
Date:     2008-10-31 18:57:37 -0700 (Fri, 31 Oct 2008)
Log Message:
-----------
fix rakefile for RC build system

Modified Paths:
--------------
    MacRuby/trunk/Rakefile

Modified: MacRuby/trunk/Rakefile
===================================================================
--- MacRuby/trunk/Rakefile	2008-11-01 01:57:15 UTC (rev 694)
+++ MacRuby/trunk/Rakefile	2008-11-01 01:57:37 UTC (rev 695)
@@ -17,7 +17,13 @@
 
 RUBY_INSTALL_NAME = do_option('ruby_install_name', 'macruby')
 RUBY_SO_NAME = do_option('ruby_so_name', RUBY_INSTALL_NAME)
-ARCHS = do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') }
+ARCHS = 
+  if s = ENV['RC_ARCHS']
+    $stderr.puts "getting archs from RC_ARCHS!"
+    s.strip.split(/\s+/)
+  else
+    do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') }
+  end
 FRAMEWORK_NAME = do_option('framework_name', 'MacRuby')
 FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks')
 NO_WARN_BUILD = !do_option('allow_build_warnings', false)
@@ -42,7 +48,8 @@
 NEW_RUBY_VERSION = version_h.scan(/#\s*define\s+RUBY_VERSION\s+\"([^"]+)\"/)[0][0]
 MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+(.*)/)[0][0]
 
-NEW_RUBY_PLATFORM = 'universal-darwin' + `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.')
+uname_release_number = (ENV['UNAME_RELEASE'] or `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.'))
+NEW_RUBY_PLATFORM = 'universal-darwin' + uname_release_number
 
 FRAMEWORK_PATH = File.join(FRAMEWORK_INSTDIR, FRAMEWORK_NAME + '.framework')
 FRAMEWORK_VERSION = File.join(FRAMEWORK_PATH, 'Versions', MACRUBY_VERSION)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20081031/19e8088c/attachment.html>