openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-21 03:55:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

!718 fix interrupt the build process when an ark compile error occurs

Browse Source 
Merge pull request !718 from zrg/fix_build_process
This commit is contained in:
openharmony_ci
2022-06-09 02:44:43 +00:00
committed by Gitee
parent 61b95b5f28 0b01b4727d
commit 02571a4caa
4 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/gen_abc.ts
+6 -1
View File
@@ -18,6 +18,10 @@ import * as process from 'process';
import * as fs from 'fs';
import cluster from 'cluster';
import { logger } from './compile_info';
import {
SUCCESS,
FAIL
} from './pre_define'
const red: string = '\u001b[31m';
const reset: string = '\u001b[39m';
@@ -41,6 +45,7 @@ function js2abcByWorkers(jsonInput: string, cmd: string): Promise<void> {
fs.renameSync(abcFile, abcFileNew);
} else {
logger.error(red, `ETS:ERROR ${abcFile} is lost`, reset);
process.exit(FAIL);
}
}
}
@@ -50,5 +55,5 @@ logger.debug('gen_abc isWorker is: ', cluster.isWorker);
if (cluster.isWorker && process.env['inputs'] !== undefined && process.env['cmd'] !== undefined) {
logger.debug('==>worker #', cluster.worker.id, 'started!');
js2abcByWorkers(process.env['inputs'], process.env['cmd']);
process.exit();
process.exit(SUCCESS);
}
compiler/src/gen_abc_plugin.ts
+26 -6
View File
@@ -41,7 +41,9 @@ import {
EXTNAME_MJS,
EXTNAME_CJS,
EXTNAME_D_TS,
EXTNAME_ABC
EXTNAME_ABC,
SUCCESS,
FAIL
} from './pre_define';
const firstFileEXT: string = '_.js';
@@ -120,6 +122,7 @@ export class GenAbcPlugin {
} else {
if (!fs.existsSync(path.resolve(arkDir, 'build'))) {
logger.error(red, 'ETS:ERROR find build fail', reset);
process.exitCode = FAIL;
return;
}
}
@@ -295,6 +298,7 @@ function handleFinishModules(modules, callback): any {
processJsModule(filePath, tempFilePath, buildFilePath, nodeModulesFile, module);
} else {
logger.error(red, `ETS:ERROR Cannot find resolve this file path: ${filePath}`, reset);
process.exitCode = FAIL;
}
}
});
@@ -329,6 +333,7 @@ function writeFileSync(inputString: string, output: string, jsBundleFile: string
intermediateJsBundle.push({path: output, size: fileSize});
} else {
logger.error(red, `ETS:ERROR Failed to convert file ${jsBundleFile} to bin. ${output} is lost`, reset);
process.exitCode = FAIL;
}
}
@@ -463,10 +468,16 @@ function invokeCluterModuleToAbc(): void {
}
cluster.on('exit', (worker, code, signal) => {
if (code === FAIL) {
process.exitCode = FAIL;
}
logger.debug(`worker ${worker.process.pid} finished`);
});
process.on('exit', (code) => {
if (process.exitCode === FAIL) {
return;
}
writeModuleHashJson();
});
}
@@ -524,10 +535,16 @@ function invokeWorkersToGenAbc(): void {
}
cluster.on('exit', (worker, code, signal) => {
if (code === FAIL) {
process.exitCode = FAIL;
}
logger.debug(`worker ${worker.process.pid} finished`);
});
process.on('exit', (code) => {
if (process.exitCode === FAIL) {
return;
}
writeHashJson();
});
}
@@ -553,7 +570,8 @@ function filterIntermediateModuleByHashJson(buildPath: string, moduleInfos: Arra
const abcPath: string = moduleInfos[i].abcFilePath;
if (!fs.existsSync(input)) {
logger.error(red, `ETS:ERROR ${input} is lost`, reset);
continue;
process.exitCode = FAIL;
break;
}
if (fs.existsSync(abcPath)) {
const hashInputContentData: any = toHashData(input);
@@ -585,7 +603,8 @@ function writeModuleHashJson(): void {
const abcPath: string = filterModuleInfos[i].abcFilePath;
if (!fs.existsSync(input) || !fs.existsSync(abcPath)) {
logger.error(red, `ETS:ERROR ${input} is lost`, reset);
continue;
process.exitCode = FAIL;
break;
}
const hashInputContentData: any = toHashData(input);
const hashAbcContentData: any = toHashData(abcPath);
@@ -625,7 +644,8 @@ function filterIntermediateJsBundleByHashJson(buildPath: string, inputPaths: Fil
const abcPath: string = input.replace(/_.js$/, EXTNAME_ABC);
if (!fs.existsSync(input)) {
logger.error(red, `ETS:ERROR ${input} is lost`, reset);
continue;
process.exitCode = FAIL;
break;
}
if (fs.existsSync(abcPath)) {
const hashInputContentData: any = toHashData(input);
@@ -671,7 +691,7 @@ function genHashJsonPath(buildPath: string): string {
buildPath = toUnixPath(buildPath);
if (process.env.cachePath) {
if (!fs.existsSync(process.env.cachePath) || !fs.statSync(process.env.cachePath).isDirectory()) {
logger.error(red, `ETS:ERROR hash path does not exist`, reset);
logger.debug(red, `ETS:ERROR hash path does not exist`, reset);
return '';
}
return path.join(process.env.cachePath, hashFile);
@@ -679,7 +699,7 @@ function genHashJsonPath(buildPath: string): string {
const dataTmps: string[] = buildPath.split(ARK);
const hashPath: string = path.join(dataTmps[0], ARK);
if (!fs.existsSync(hashPath) || !fs.statSync(hashPath).isDirectory()) {
logger.error(red, `ETS:ERROR hash path does not exist`, reset);
logger.debug(red, `ETS:ERROR hash path does not exist`, reset);
return '';
}
return path.join(hashPath, hashFile);
compiler/src/gen_module_abc.ts
+6 -2
View File
@@ -17,6 +17,10 @@ import * as childProcess from 'child_process';
import * as process from 'process';
import cluster from 'cluster';
import { logger } from './compile_info';
import {
SUCCESS,
FAIL
} from './pre_define'
const red: string = '\u001b[31m';
const reset: string = '\u001b[39m';
@@ -35,7 +39,7 @@ function js2abcByWorkers(jsonInput: string, cmd: string): Promise<void> {
childProcess.execSync(singleCmd);
} catch (e) {
logger.error(red, `ETS:ERROR Failed to convert file ${inputsStr} to abc `, reset);
return;
process.exit(FAIL);
}
return;
@@ -46,5 +50,5 @@ logger.debug('gen_abc isWorker is: ', cluster.isWorker);
if (cluster.isWorker && process.env['inputs'] !== undefined && process.env['cmd'] !== undefined) {
logger.debug('==>worker #', cluster.worker.id, 'started!');
js2abcByWorkers(process.env['inputs'], process.env['cmd']);
process.exit();
process.exit(SUCCESS);
}
compiler/src/pre_define.ts
+3
View File
@@ -252,3 +252,6 @@ export const EXTNAME_MJS: string = '.mjs';
export const EXTNAME_CJS: string = '.cjs';
export const EXTNAME_D_TS: string = '.d.ts';
export const EXTNAME_ABC: string = '.abc';
export const SUCCESS: number = 0;
export const FAIL: number = 1;