kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-04-19 23:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't pass --no-64-bit on Snow Leopard, use the Rake #sh method to call gen_bridge_metadata so that the line appears when --trace is passed

Browse Source
This commit is contained in:
Laurent Sansonetti
2012-06-06 18:03:15 +02:00
parent 6e6bac9077
commit 4f42dcff22
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/motion/project/config.rb
View File

@@ -23,6 +23,8 @@
module Motion; module Project
class Config
include Rake::DSL if Rake.const_defined?(:DSL)
VARS = []
def self.variable(*syms)
@@ -76,6 +78,8 @@ module Motion; module Project
@build_mode = build_mode
end
OSX_VERSION = `/usr/bin/sw_vers -productVersion`.strip.sub(/\.\d+$/, '').to_f
def variables
map = {}
VARS.each do |sym|
@@ -572,11 +576,9 @@ EOS
includes = headers.map { |header| "-I\"#{File.dirname(header)}\"" }.uniq
a = sdk_version.scan(/(\d+)\.(\d+)/)[0]
sdk_version_headers = ((a[0].to_i * 10000) + (a[1].to_i * 100)).to_s
extra_flags = OSX_VERSION >= 10.7 ? '--no-64-bit' : ''
line = "/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -I. #{includes.join(' ')}\" #{headers.join(' ')} -o \"#{bs_file}\""
unless system(line)
App.fail "Error when generating bridge metadata: #{line}"
end
sh "/usr/bin/gen_bridge_metadata --format complete #{extra_flags} --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -I. #{includes.join(' ')}\" #{headers.join(' ')} -o \"#{bs_file}\""
end
end
end; end