kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-03-29 17:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

better detection of default API level + validation

Browse Source
This commit is contained in:
Laurent Sansonetti
2014-10-06 16:58:19 +02:00
parent 3b482596e8
commit 2ad68959f3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,12 @@ module Motion; module Project;
App.fail "app.ndk_path should point to a valid Android NDK directory."
end
if api_version == nil or !File.exist?("#{sdk_path}//platforms/android-#{api_version}")
App.fail "The Android SDK installed on your system does not support " + (api_version == nil ? "any API level" : "API level #{api_version}") + ". Run the `#{sdk_path}/tools/android' program to install missing API levels."
end
if !File.exist?("#{ndk_path}/platforms/android-#{api_version_ndk}")
App.fail "It looks like your version of the NDK does not support API level #{api_version}. Switch to a lower API level or install a more recent NDK."
App.fail "The Android NDK installed on your system does not support API level #{api_version}. Switch to a lower API level or install a more recent NDK."
end
super
@@ -101,15 +105,17 @@ module Motion; module Project;
md = File.basename(path).match(/\d+$/)
md ? md[0] : nil
end.compact
if versions.empty?
App.fail "Given Android SDK does not support any API version (nothing relevant in `#{sdk_path}/platforms')"
end
return nil if versions.empty?
numbers = versions.map { |x| x.to_i }
vers = numbers.max
if vers == 20
# Don't return 20 (L) by default, as it's not yet stable.
numbers.delete(vers)
vers = numbers.max
if numbers.size > 1
# Don't return 20 (L) by default, as it's not yet stable.
numbers.delete(vers)
vers = numbers.max
else
vers = 'L'
end
end
vers.to_s
end