diff --git a/NEWS b/NEWS index a50ad1db..b23635c5 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ The dSYM file path was changed to fix a bug. * [iOS] Fixed a bug where the RubyMotion shared framework would not update even if it changed the code in framework. + * [OSX] Fixed a bug where it would trigger a crash when it will use a REPL. * Fixed a bug where GLKit functions would trigger a crash when it will run app on iOS simulator. diff --git a/data/Rakefile b/data/Rakefile index e4905e8e..6e8f2c3d 100644 --- a/data/Rakefile +++ b/data/Rakefile @@ -24,12 +24,6 @@ task :vm_files do install path, sdk end install File.join(objs, 'librubymotion-static.a'), sdk - - if first and ENV['SDK_BETA'] == nil - objs = "../vm/MacOSX#{sdk_version}-repl.objs" - install File.join(objs, 'librubymotion-repl.dylib'), 'osx' - first = false - end end IOS_SDK_VERSIONS.each do |sdk_version| @@ -50,6 +44,12 @@ task :vm_files do install File.join(objs, 'librubymotion-static.a'), sim end + if OSX_SDK_VERSIONS.size > 1 and ENV['SDK_BETA'] == nil + raise "[!] Need OS X 10.8 SDK for REPL" unless OSX_SDK_VERSIONS.include?('10.8') + osx_repl = "../vm/MacOSX10.8-repl.objs" + install File.join(osx_repl, 'librubymotion-repl.dylib'), 'osx' + end + if IOS_SDK_VERSIONS.size > 1 and ENV['SDK_BETA'] == nil # Create a fat librubymotion-repl.dylib library for iOS simulator. The i386 slice has a deployment_target for 4.3 and the x86_64 slice has a deployment_target for 7.1. first_ios_repl = "../vm/iPhoneSimulator#{IOS_SDK_VERSIONS.first}-repl.objs/librubymotion-repl.dylib"