From b14d0b9685469513eae5716c051b8ac9da8c1a13 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 5 Jul 2019 22:45:59 +0200 Subject: [PATCH] Fixing packager for "old" (6) node versions --- installer/build.ts | 4 +++- jenkins/create_build.sh | 12 ++++++++++-- package.json | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/installer/build.ts b/installer/build.ts index 60bec38..1747ded 100644 --- a/installer/build.ts +++ b/installer/build.ts @@ -315,7 +315,9 @@ async function create_default_ui_pack(target_directory: string) { } let path; -packager(options).then(async app_paths => { +(async () => { + await new Promise((resolve, reject) => packager(options, (err, appPaths) => err ? reject(err) : resolve(appPaths))) +})().then(async app_paths => { console.log("Copying changelog file!"); await util.promisify(fs.copyFile)(path_helper.join(options.dir, "github", "ChangeLog.txt"), path_helper.join(app_paths[0], "ChangeLog.txt")); return app_paths; diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index e1bd5a5..1c6ba2c 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -20,9 +20,17 @@ function compile_scripts() { check_err_exit ${project_name} "Failed to build shared ui import declarations!" npm run compile-tsc -- -p modules/tsconfig_main.json + check_err_exit ${project_name} "Failed to compile typescript main files!" npm run compile-tsc -- -p modules/tsconfig_renderer.json - npm run compile-tsc -- -p installer/tsconfig_linux.json - check_err_exit ${project_name} "Failed to compile typescript files!" + check_err_exit ${project_name} "Failed to compile typescript renderer files!" + + if [[ ${build_os_type} == "win32" ]]; then + npm run compile-tsc -- -p installer/tsconfig_windows.json + check_err_exit ${project_name} "Failed to compile typescript installer files!" + else + npm run compile-tsc -- -p installer/tsconfig_linux.json + check_err_exit ${project_name} "Failed to compile typescript installer files!" + fi npm run compile-sass check_err_exit ${project_name} "Failed to compile sass files!" diff --git a/package.json b/package.json index 53d1dbf..0faae5c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "license": "ISC", "devDependencies": { "@types/ejs": "^2.6.3", - "@types/electron-packager": "^14.0.0", + "@types/electron-packager": "8.7.2", "@types/fs-extra": "^8.0.0", "@types/jquery": "^3.3.30", "@types/request": "^2.48.1", @@ -30,7 +30,7 @@ "asar": "^2.0.1", "cmake-js": "^4.0.1", "ejs": "^2.6.2", - "electron-packager": "^14.0.1", + "electron-packager": "8.7.2", "nodemon": "^1.19.1", "sass": "^1.22.2", "typescript": "^3.5.2"