kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update AIRHelper to use project.keystore (close #1095)

Browse Source
This commit is contained in:
Joshua Granick
2017-10-23 09:16:39 -07:00
parent 33c4970712
commit c42f6f9a34
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lime/tools/helpers/AIRHelper.hx
View File

@@ -72,40 +72,34 @@ class AIRHelper {
var signingOptions = []; var signingOptions = [];
if (project.defines.exists ("KEY_STORE")) { if (project.keystore != null) {
var keystore = project.defines.get ("KEY_STORE"); var keystore = PathHelper.tryFullPath (project.keystore.path);
var keystoreType = "pkcs12"; var keystoreType = project.keystore.type != null ? project.keystore.type : "pkcs12";
if (project.defines.exists ("KEY_STORE_TYPE")) {
keystoreType = project.defines.get ("KEY_STORE_TYPE");
}
signingOptions.push ("-storetype"); signingOptions.push ("-storetype");
signingOptions.push (keystoreType); signingOptions.push (keystoreType);
signingOptions.push ("-keystore"); signingOptions.push ("-keystore");
signingOptions.push (keystore); signingOptions.push (keystore);
if (project.defines.exists ("KEY_STORE_ALIAS")) { if (project.keystore.alias != null) {
signingOptions.push ("-alias"); signingOptions.push ("-alias");
signingOptions.push (project.defines.get ("KEY_STORE_ALIAS")); signingOptions.push (project.keystore.alias);
} }
if (project.defines.exists ("KEY_STORE_PASSWORD")) { if (project.keystore.password != null) {
signingOptions.push ("-storepass"); signingOptions.push ("-storepass");
signingOptions.push (project.defines.get ("KEY_STORE_PASSWORD")); signingOptions.push (project.keystore.password);
} }
if (project.defines.exists ("KEY_STORE_ALIAS_PASSWORD")) { if (project.keystore.aliasPassword != null) {
signingOptions.push ("-keypass"); signingOptions.push ("-keypass");
signingOptions.push (project.defines.get ("KEY_STORE_ALIAS_PASSWORD")); signingOptions.push (project.keystore.aliasPassword);
} }