diff --git a/installer/build.ts b/installer/build.ts index 350eb9a..41ce724 100644 --- a/installer/build.ts +++ b/installer/build.ts @@ -193,16 +193,15 @@ options.ignore = path => { }; async function copy_striped(source: string, target: string, symbol_directory: string) { - const copy_file = util.promisify(fs.copyFile); - const exec = util.promisify(child_process.exec); + const exec = (command, options) => new Promise<{ stdout: Buffer | string, stderr: Buffer | string}>((resolve, reject) => child_process.exec(command, options, (error, out, err) => error ? reject(error) : resolve({stdout: out, stderr: err}))); if(process.argv[2] == "win32") { - await copy_file(source, target); + await fs.copy(source, target); return; } if(process.argv[2] != "linux") throw "invalid target type"; - await copy_file(source, target); + await fs.copy(source, target); { const symbols_command = await exec("dump_syms " + target, { @@ -317,7 +316,7 @@ let path; new Promise((resolve, reject) => packager(options, (err, appPaths) => err ? reject(err) : resolve(appPaths))).then(async app_paths => { console.log("Copying changelog file!"); /* We dont have promisify in our build system */ - fs.copyFileSync(path_helper.join(options.dir, "github", "ChangeLog.txt"), path_helper.join(app_paths[0], "ChangeLog.txt")); + await fs.copy(path_helper.join(options.dir, "github", "ChangeLog.txt"), path_helper.join(app_paths[0], "ChangeLog.txt")); return app_paths; }).then(async app_paths => { await create_native_addons(path_helper.join(app_paths[0], "resources", "natives"), "build/symbols"); @@ -340,6 +339,7 @@ new Promise((resolve, reject) => packager(options, (err, appPaths) => err ? reje }).then(() => { console.log("Package created"); }).catch(error => { + console.error(error); console.error("Failed to create package!"); process.exit(1); }); diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index 1c6ba2c..d03feb7 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -60,6 +60,9 @@ function compile_native() { eval ${_command} check_err_exit ${project_name} "Failed create build targets!" + cmake --build `pwd` --target update_installer -- -j 12 + check_err_exit ${project_name} "Failed build teaclient update installer!" + cmake --build `pwd` --target teaclient_connection -- -j 12 check_err_exit ${project_name} "Failed build teaclient connection!" diff --git a/package.json b/package.json index 5204da2..537f3a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TeaClient", - "version": "1.3.5", + "version": "1.3.6", "description": "", "main": "main.js", "scripts": {