Revision
2859
Author
lsansonetti@apple.com
Date
2009-10-19 16:39:05 -0700 (Mon, 19 Oct 2009)

Log Message

don't define MACRUBY_VERSION if it's already there (we may run under macrake)

Modified Paths

Diff

Modified: MacRuby/trunk/rakelib/builder.rb (2858 => 2859)


--- MacRuby/trunk/rakelib/builder.rb	2009-10-19 23:38:40 UTC (rev 2858)
+++ MacRuby/trunk/rakelib/builder.rb	2009-10-19 23:39:05 UTC (rev 2859)
@@ -61,7 +61,9 @@
 
 version_h = File.read('version.h')
 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]
+unless defined?(MACRUBY_VERSION)
+  MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+\"(.*)\"/)[0][0]
+end
 
 uname_release_number = (ENV['UNAME_RELEASE'] or `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.'))
 NEW_RUBY_PLATFORM = 'universal-darwin' + uname_release_number