kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-01-12 22:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

not embed kernel-*.bc into each compiled files

Browse Source 
http://hipbyte.myjetbrains.com/youtrack/issue/RM-652
This commit is contained in:
Watson
2014-11-04 22:34:19 +09:00
parent 117abe90a5
commit b257909cb7
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/Rakefile
View File

@@ -20,28 +20,46 @@ task :vm_files do
sdk = File.join('osx', sdk_version, 'MacOSX')
mkdir_p sdk
objs = "../vm/MacOSX#{sdk_version}.objs"
kernels = []
Dir.glob(File.join(objs, 'kernel-*.bc')).each do |path|
install path, sdk
arch = path.match(/kernel-(.+).bc/)[1]
sh "/usr/bin/clang -fexceptions -c -arch #{arch} -mmacosx-version-min=#{sdk_version} #{path} -o /tmp/kernel-#{arch}.o"
kernels << "/tmp/kernel-#{arch}.o"
end
install File.join(objs, 'librubymotion-static.a'), sdk
sh "/usr/bin/lipo -create #{kernels.join(' ')} -output /tmp/kernel.o"
install "/tmp/kernel.o", sdk
end
IOS_SDK_VERSIONS.each do |sdk_version|
ios = File.join('ios', sdk_version, 'iPhoneOS')
mkdir_p ios
objs = "../vm/iPhoneOS#{sdk_version}.objs"
kernels = []
Dir.glob(File.join(objs, 'kernel-*.bc')).each do |path|
install path, ios
arch = path.match(/kernel-(.+).bc/)[1]
sh "/usr/bin/clang -fexceptions -c -arch #{arch} -miphoneos-version-min=#{sdk_version} #{path} -o /tmp/kernel-#{arch}.o"
kernels << "/tmp/kernel-#{arch}.o"
end
install File.join(objs, 'librubymotion-static.a'), ios
sh "/usr/bin/lipo -create #{kernels.join(' ')} -output /tmp/kernel.o"
install "/tmp/kernel.o", ios
sim = File.join('ios', sdk_version, 'iPhoneSimulator')
mkdir_p sim
objs = "../vm/iPhoneSimulator#{sdk_version}.objs"
kernels = []
Dir.glob(File.join(objs, 'kernel-*.bc')).each do |path|
install path, sim
arch = path.match(/kernel-(.+).bc/)[1]
sh "/usr/bin/clang -fexceptions -c -arch #{arch} -miphoneos-version-min=#{sdk_version} #{path} -o /tmp/kernel-#{arch}.o"
kernels << "/tmp/kernel-#{arch}.o"
end
install File.join(objs, 'librubymotion-static.a'), sim
sh "/usr/bin/lipo -create #{kernels.join(' ')} -output /tmp/kernel.o"
install "/tmp/kernel.o", sim
end
if OSX_SDK_VERSIONS.size > 1 and ENV['SDK_BETA'] == nil

3
lib/motion/project/builder.rb
View File

@@ -317,7 +317,8 @@ EOS
objs_file = Tempfile.new('linker-objs-list')
objs_list.each { |obj| objs_file.puts(obj) }
objs_file.close # flush
sh "#{cxx} -o \"#{main_exec}\" -filelist \"#{objs_file.path}\" #{config.ldflags(platform)} -L#{File.join(datadir, platform)} -lrubymotion-static -lobjc -licucore #{linker_option} #{framework_search_paths} #{frameworks} #{weak_frameworks} #{config.libs.join(' ')} #{vendor_libs}"
kernel = File.join(datadir, platform, "kernel.o")
sh "#{cxx} -o \"#{main_exec}\" \"#{kernel}\" -filelist \"#{objs_file.path}\" #{config.ldflags(platform)} -L#{File.join(datadir, platform)} -lrubymotion-static -lobjc -licucore #{linker_option} #{framework_search_paths} #{frameworks} #{weak_frameworks} #{config.libs.join(' ')} #{vendor_libs}"
main_exec_created = true
# Change the install name of embedded frameworks.

3
lib/motion/project/template/ios-extension-builder.rb
View File

@@ -349,7 +349,8 @@ EOS
"-stdlib=libstdc++"
end
end || ""
sh "#{cxx} -o \"#{main_exec}\" #{objs_list} #{config.ldflags(platform)} -L#{File.join(datadir, platform)} -lrubymotion-static -lobjc -licucore #{linker_option} #{framework_search_paths} #{frameworks} #{weak_frameworks} #{config.libs.join(' ')} #{vendor_libs}"
kernel = File.join(datadir, platform, "kernel.o")
sh "#{cxx} -o \"#{main_exec}\" \"#{kernel}\" #{objs_list} #{config.ldflags(platform)} -L#{File.join(datadir, platform)} -lrubymotion-static -lobjc -licucore #{linker_option} #{framework_search_paths} #{frameworks} #{weak_frameworks} #{config.libs.join(' ')} #{vendor_libs}"
main_exec_created = true
end