Merge pull request #463 from PatriceJiang/fix-lua-.keystore

[android] cocos run locate gradle.properties file

Author: minggo

bin/strings.json

@@ -221,6 +221,7 @@
         "COMPILE_INFO_NOT_A_FILE" : "The string inputed is not a file!",
         "COMPILE_INFO_ANDROID_PROJPATH_FMT" : "Using %s project : %s",
         "COMPILE_TIP_INPUT_KEYSTORE" : "Please input the absolute/relative path of '.keystore' file:",
+        "COMPILE_GRADLE_PROPERTIES_NOT_FOUND" : "gradle.properties not found!",
         "COMPILE_TIP_INPUT_ALIAS" : "Please input the alias:",
         "COMPILE_TIP_INPUT_KEY_PASS" : "Please input the password of key store:",
         "COMPILE_TIP_INPUT_ALIAS_PASS" : "Please input the password of alias:",
@@ -567,6 +568,7 @@
         "COMPILE_INFO_NOT_A_FILE" : "输入的路径不是一个有效的文件。",
         "COMPILE_INFO_ANDROID_PROJPATH_FMT" : "使用 %s 工程：%s",
         "COMPILE_TIP_INPUT_KEYSTORE" : "请输入 '.keystore' 文件的绝对路径（相对路径）：",
+        "COMPILE_GRADLE_PROPERTIES_NOT_FOUND" : "gradle.properties 未找到!",
         "COMPILE_TIP_INPUT_ALIAS" : "请输入签名文件的别名：",
         "COMPILE_TIP_INPUT_KEY_PASS" : "请输入签名文件的密码：",
         "COMPILE_TIP_INPUT_ALIAS_PASS" : "请输入别名的密码：",
@@ -912,6 +914,7 @@
         "COMPILE_INFO_NOT_A_FILE" : "輸入的路徑不是一個有效的檔案。",
         "COMPILE_INFO_ANDROID_PROJPATH_FMT" : "使用 %s 工程：%s",
         "COMPILE_TIP_INPUT_KEYSTORE" : "請輸入 '.keystore' 檔案的絕對路徑（相對路徑）：",
+        "COMPILE_GRADLE_PROPERTIES_NOT_FOUND" : "gradle.properties 未找到!",
         "COMPILE_TIP_INPUT_ALIAS" : "請輸入簽名檔案的別名：",
         "COMPILE_TIP_INPUT_KEY_PASS" : "請輸入簽名檔案的密碼：",
         "COMPILE_TIP_INPUT_ALIAS_PASS" : "請輸入別名的密碼：",

plugins/plugin_compile/build_android.py

@@ -54,8 +54,13 @@ def __init__(self, verbose, app_android_root, no_res, proj_obj, mode, build_type
         # check environment variable
         self.sdk_root = cocos.check_environment_variable('ANDROID_SDK_ROOT')
         self.ant_root = None
-        self.sign_prop_file = os.path.join(self.app_android_root, 'app', "gradle.properties")
-
+        if os.path.exists(os.path.join(self.app_android_root, "gradle.properties")):
+            self.sign_prop_file = os.path.join(self.app_android_root, "gradle.properties")
+        elif os.path.exists(os.path.join(self.app_android_root, 'app', "gradle.properties")):
+            self.sign_prop_file = os.path.join(self.app_android_root, 'app', "gradle.properties")
+        else:
+            raise cocos.CCPluginError(MultiLanguage.get_string('COMPILE_GRADLE_PROPERTIES_NOT_FOUND'),
+                                  cocos.CCPluginError.ERROR_PATH_NOT_FOUND)
         self._parse_cfg()
 
     def _run_cmd(self, command, cwd=None):