Merge branch 'master' of github.com:lrz/RubyMotion

This commit is contained in:
Laurent Sansonetti
2013-07-22 13:23:34 +02:00
4 changed files with 14 additions and 5 deletions

3
NEWS
View File

@@ -27,10 +27,13 @@
* Fixed a bug in build system where app.deployment_target and app.sdk_version
were compared as String. Thanks to Andrew Babichev for the patch (pull
request #108).
* Added `rake crashlog' task to show a last crash log.
* [iOS] Fixed a warning message from the linker that would be displayed when
use Xcode 5.
* [iOS] Fixed a bug in debugger where built-in debug commands are not working
with simulator.
* [iOS] Fixed a bug in build system where app does not work on iOS5 device.
* [iOS] Fixed a bug where it could not use NSUIntegerMax constant in iOS 7.
= RubyMotion 2.4 =

View File

@@ -144,7 +144,7 @@ task :bridgesupport_files do
if framework == 'Foundation' and sdk_version >= '7.0'
# In iOS 7.0, NSObject is defined in /usr/include/objc/NSObject.h
sh "/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -DTARGET_OS_IPHONE -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -framework #{framework} -I#{sdk_path}/usr/include \" objc/NSObject.h > /tmp/NSObject.bridgesupport"
sh "/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -DTARGET_OS_IPHONE -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -framework #{framework} -I#{sdk_path}/usr/include \" objc/NSObject.h objc/NSObjCRuntime.h > /tmp/NSObject.bridgesupport"
merge_bridgesupport dest, '/tmp/NSObject.bridgesupport'
end
end

View File

@@ -69,3 +69,9 @@ task :ctags do
sh "#{ctags} --options=\"#{config}\" #{bs_files.map { |x| '"' + x + '"' }.join(' ')}"
end
end
desc "Show a last crash log"
task :crashlog do
logs = Dir.glob(File.join(File.expand_path("~/Library/Logs/DiagnosticReports/"), "#{App.config.name}_*"))
sh "open -a Console #{logs.last}"
end

View File

@@ -137,15 +137,15 @@ module Motion; module Project;
def common_flags(platform)
simulator_version = begin
flag = " -miphoneos-version-min=#{deployment_target}"
if platform == "iPhoneSimulator"
ver = xcode_version[0].match(/(\d+)/)
if ver[0].to_i >= 5
" -mios-simulator-version-min=#{deployment_target}"
else
" -miphoneos-version-min=#{deployment_target}"
flag = " -mios-simulator-version-min=#{deployment_target}"
end
end
end || ""
flag
end
super + simulator_version
end