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

pass kernel path to REPL, minor refactoring

Browse Source
This commit is contained in:
Laurent Sansonetti
2014-09-11 17:15:54 +02:00
parent fb94e5edf0
commit 9aa2d644cd
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/motion/project/template/android.rb
View File

@@ -45,7 +45,7 @@ task :build do
bs_files += App.config.vendored_bs_files
ruby_bs_flags = bs_files.map { |x| "--uses-bs \"#{x}\"" }.join(' ')
objs_build_dir = File.join(app_build_dir, 'obj', 'local', App.config.armeabi_directory_name)
kernel_bc = File.join(App.config.versioned_arch_datadir, "kernel-#{App.config.arch}.bc")
kernel_bc = App.config.kernel_path
ruby_objs_changed = false
App.config.files.each do |ruby_path|
bc_path = File.join(objs_build_dir, ruby_path + '.bc')
@@ -463,7 +463,7 @@ def run_apk(mode)
# Enable port forwarding for the REPL socket.
sh "\"#{adb_path}\" #{adb_mode_flag(mode)} forward tcp:33333 tcp:33333"
# Launch the REPL.
sh "\"#{App.config.bin_exec('android/repl')}\" 0.0.0.0 33333"
sh "\"#{App.config.bin_exec('android/repl')}\" \"#{App.config.kernel_path}\" 0.0.0.0 33333"
end
end

6
lib/motion/project/template/android/config.rb
View File

@@ -206,7 +206,11 @@ module Motion; module Project;
end
def bin_exec(name)
File.join(App.config.motiondir, 'bin', name)
File.join(motiondir, 'bin', name)
end
def kernel_path
File.join(versioned_arch_datadir, "kernel-#{arch}.bc")
end
attr_reader :vendored_projects