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

make sure .class files as well as the DEX file are really re-generated every time (for now)

Browse Source
This commit is contained in:
Laurent Sansonetti
2014-04-10 15:28:35 +02:00
parent 21522a99e3
commit 68a3f6ab45
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,16 +188,14 @@ EOS
if !File.exist?(class_path) or File.mtime(java_path) > File.mtime(class_path)
App.info 'Compile', java_path
sh "/usr/bin/javac -d \"#{classes_dir}\" -classpath #{class_path} -sourcepath \"#{java_dir}\" -target 1.5 -bootclasspath \"#{android_jar}\" -encoding UTF-8 -g -source 1.5 \"#{java_path}\""
rebuild_dex_classes = true
end
end
# Generate the dex file.
dex_classes = File.join(App.config.build_dir, 'classes.dex')
if !File.exist?(dex_classes) or rebuild_dex_classes
App.info 'Create', dex_classes
sh "\"#{App.config.build_tools_dir}/dx\" --dex --output \"#{dex_classes}\" \"#{classes_dir}\" \"#{App.config.sdk_path}/tools/support/annotations.jar\" #{vendored_jars.join(' ')}"
end
rm_rf dex_classes
App.info 'Create', dex_classes
sh "\"#{App.config.build_tools_dir}/dx\" --dex --output \"#{dex_classes}\" \"#{classes_dir}\" \"#{App.config.sdk_path}/tools/support/annotations.jar\" #{vendored_jars.join(' ')}"
# Generate the Android manifest file.
android_manifest = File.join(App.config.build_dir, 'AndroidManifest.xml')