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

app.resources_dirs are now used for android resources, introduce app.assets_dirs to store raw assets (and it defaults to the ‘assets’ project directory)

Browse Source
This commit is contained in:
Laurent Sansonetti
2014-05-17 17:17:22 +02:00
parent ffbb6e4f59
commit c629a10ddf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,8 +284,9 @@ EOS
or File.mtime(android_manifest) > File.mtime(archive) \
or App.config.resources_dirs.any? { |x| File.mtime(x) > File.mtime(archive) }
App.info 'Create', archive
resource_flags = App.config.resources_dirs.map { |x| '-A "' + x + '"' }.join(' ')
sh "\"#{App.config.build_tools_dir}/aapt\" package -f -M \"#{android_manifest}\" #{resource_flags} -I \"#{android_jar}\" -F \"#{archive}\""
assets_flags = App.config.assets_dirs.map { |x| '-A "' + x + '"' }.join(' ')
resources_flags = App.config.resources_dirs.map { |x| '-S "' + x + '"' }.join(' ')
sh "\"#{App.config.build_tools_dir}/aapt\" package -f -M \"#{android_manifest}\" #{assets_flags} #{resources_flags} -I \"#{android_jar}\" -F \"#{archive}\""
Dir.chdir(App.config.build_dir) do
[File.basename(dex_classes), libpayload_subpath, gdbserver_subpath].each do |file|
line = "\"#{App.config.build_tools_dir}/aapt\" add -f \"../#{archive}\" \"#{file}\""

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

@@ -28,7 +28,7 @@ module Motion; module Project;
register :android
variable :sdk_path, :ndk_path, :avd_config, :package, :main_activity,
:sub_activities, :api_version, :arch
:sub_activities, :api_version, :arch, :assets_dirs, :icon
def initialize(project_dir, build_mode)
super
@@ -36,6 +36,7 @@ module Motion; module Project;
@main_activity = 'MainActivity'
@sub_activities = []
@arch = 'armv5te'
@assets_dirs = [File.join(project_dir, 'assets')]
end
def validate