jh5_app_build 1.0.19 → 1.0.20

package/lib/build_std.js

@@ -3,6 +3,7 @@ let archiver = require('archiver');
 let jutils = require('base_parts');
 
 let fs = require('fs');
+let path = require('path');
 let os = require('os');
 let AdmZip = require('adm-zip');
 let child_process = require('child_process');
@@ -162,13 +163,17 @@ module.exports = async (cmd, buildCfg) => {
     console.log(`not find keystore,making ...`);
     let jreCwd = "C:\\jdev_develop\\jre\\bin";
     let keyStoreFile = `${buildCfg.rootPath}/sigin/apk_cert.keystore`;
+    try {
+        fs.mkdirSync(path.dirname(keyStoreFile));
+    } catch (error) {
+    }
     if (!fs.existsSync(keyStoreFile)) {
         // 生成签名
         child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
             "-genkey",
             "-storepass", "123456",
             "-keypass", "123456",
-            "-alias", "apk_cert.keystore",
+            "-alias", "apk_cert",
             "-keyalg", "RSA",
             "-validity", "20000",
             "-keystore", keyStoreFile,
@@ -180,28 +185,30 @@ module.exports = async (cmd, buildCfg) => {
 
     // 签名
     console.log(`sign apk ...`);
+    var singApkTmp = buildCfg.outpath + "_sign.apk";
     child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
         "-verbose",
         "-storepass", "123456",
         "-keypass", "123456",
-        "-keystore", "apk_cert.keystore",
-        "-signedjar", buildCfg.outpath + "_sign.apk",
+        "-keystore", keyStoreFile,
+        "-signedjar", singApkTmp,
         buildCfg.outpath,
-        keyStoreFile
+        "apk_cert"
     ], {
         cwd: jreCwd
     });
+    fs.unlinkSync(buildCfg.outpath); // 删除未签名的
 
     // 对齐apk
     console.log(`zip align ...`);
-    fs.unlinkSync(buildCfg.outpath);
     child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
         "-v", "4",
-        buildCfg.outpath + "_sign.apk",
+        singApkTmp,
         buildCfg.outpath
     ], {
         cwd: jreCwd
     });
+    fs.unlinkSync(singApkTmp); // 删除未对齐的
 
     // 完成
     console.log(`build success:${buildCfg.outpath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jh5_app_build",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "jaskle jh5_app_build",
   "main": "./bin/jh5_app_build.js",
   "registry": true,