[DEV] correct the android application naming

This commit is contained in:
Edouard DUPIN 2015-11-02 21:35:08 +01:00
parent d5e9ed5995
commit 76337593b3

View File

@ -189,9 +189,9 @@ def tool_generate_main_java_class(target, module, package_name):
file_list = [] file_list = []
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
debug.debug("Generate android wrapping for '" + package_name + "'") debug.debug("Generate android wrapping for '" + package_name + "' ==> '" + target.convert_name_application(package_name) + "'" )
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
application_name = package_name application_name = target.convert_name_application(package_name)
if target.config["mode"] == "debug": if target.config["mode"] == "debug":
application_name += "debug" application_name += "debug"
target.path_java_project= target.get_build_path(package_name) \ target.path_java_project= target.get_build_path(package_name) \
@ -356,7 +356,10 @@ def tool_generate_main_java_class(target, module, package_name):
tmpFile.write( '<!-- Manifest is autoGenerated with Gale ... do not patch it-->\n') tmpFile.write( '<!-- Manifest is autoGenerated with Gale ... do not patch it-->\n')
tmpFile.write( '<manifest xmlns:android="http://schemas.android.com/apk/res/android" \n') tmpFile.write( '<manifest xmlns:android="http://schemas.android.com/apk/res/android" \n')
tmpFile.write( ' package="' + android_package_name + '" \n') tmpFile.write( ' package="' + android_package_name + '" \n')
tmpFile.write( ' android:versionCode="'+module.package_prop["VERSION_CODE"]+'" \n') if module.package_prop["VERSION_CODE"] == '':
debug.warning("Missing application 'VERSION_CODE' ==> set it at '0' (this can creata an NON update on android play store)")
module.package_prop["VERSION_CODE"] = "0"
tmpFile.write( ' android:versionCode="' + str(module.package_prop["VERSION_CODE"]) + '" \n')
tmpFile.write( ' android:versionName="'+tools.version_to_string(module.package_prop["VERSION"])+'"> \n') tmpFile.write( ' android:versionName="'+tools.version_to_string(module.package_prop["VERSION"])+'"> \n')
tmpFile.write( ' <uses-feature android:glEsVersion="0x00020000" android:required="true" />\n') tmpFile.write( ' <uses-feature android:glEsVersion="0x00020000" android:required="true" />\n')
tmpFile.write( ' <uses-sdk android:minSdkVersion="' + str(target.board_id) + '" \n') tmpFile.write( ' <uses-sdk android:minSdkVersion="' + str(target.board_id) + '" \n')