make sure use librubymotion-repl.dylib in OSX 10.8

http://hipbyte.myjetbrains.com/youtrack/issue/RM-608

if use librubymotion-repl.dylib in vm/MacOSX10.10-repl.objs and vm/MacOSX10.9-repl.objs, REPL cause a crash with "1): Symbol not found: __ZNSs4_Rep11_S_terminalE" error.

Now, OSX build order is "10.10,10.6,10.7,10.8,10.9", so OSX 10.10's librubymotion-repl.dylib was installed.
This commit is contained in:
Watson
2014-10-02 09:02:45 +09:00
parent 8f4fa78736
commit 53a0705dd1
2 changed files with 7 additions and 6 deletions

1
NEWS
View File

@@ -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.

View File

@@ -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"