From 4e814f6e2e44fd579c00beeb8864fb01e2605f8c Mon Sep 17 00:00:00 2001 From: yangagfur Date: Thu, 14 Aug 2025 11:58:04 +0000 Subject: [PATCH 1/2] update scripts/compile_app.py. Signed-off-by: yangagfur --- scripts/compile_app.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/compile_app.py b/scripts/compile_app.py index 3d906f9edf..fab2bb20ad 100755 --- a/scripts/compile_app.py +++ b/scripts/compile_app.py @@ -228,6 +228,13 @@ def hvigor_write_log(cmd, cwd, env): raise Exception('ReturnCode:{}. Hvigor build failed: {}'.format(proc.returncode, stderr)) print("[0/0] Hvigor build end") +def is_cj_project(cwd: str): + print(f"[0/0] project dir: {cwd}") + with open(os.path.join(cwd, 'hvigor/hvigor_cofig.json5'), 'r') as input_f: + hvigor_info = json5.load(input_f) + dependencies = hvigor_info.get('dependencies') + is_cj_project = "@ohos/cangjie-build-support" in dependencies.keys() + return is_cj_project def build_hvigor_cmd(cwd: str, model_version: str, options): cmd = ['bash'] @@ -241,6 +248,9 @@ def build_hvigor_cmd(cwd: str, model_version: str, options): else: cmd.extend(['./hvigorw']) + if is_cj_project(cwd): + options.test_hap = False + if options.ohos_app_enable_asan: cmd.extend(['-p', 'ohos-debug-asan=true']) elif options.ohos_app_enable_tsan: @@ -313,6 +323,12 @@ def write_env_sdk(options, env): def hvigor_sync(cwd: str, model_version: str, env): if not model_version: + if is_cj_project(cwd): + subprocess.run(['bash', './hvigorw', '--model', 'module', '-p', 'module=entry@default', 'SyncCangjieResource', '--no-daemon'], + cwd=cwd, + env=env, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL) subprocess.run(['bash', './hvigorw', '--sync', '--no-daemon'], cwd=cwd, env=env, -- Gitee From 6303039f32a56e684e440f2254aad991ec23a0ef Mon Sep 17 00:00:00 2001 From: yangagfur Date: Thu, 21 Aug 2025 07:53:57 +0000 Subject: [PATCH 2/2] update scripts/compile_app.py. Signed-off-by: yangagfur --- scripts/compile_app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile_app.py b/scripts/compile_app.py index fab2bb20ad..2dcaee3dcb 100755 --- a/scripts/compile_app.py +++ b/scripts/compile_app.py @@ -230,7 +230,7 @@ def hvigor_write_log(cmd, cwd, env): def is_cj_project(cwd: str): print(f"[0/0] project dir: {cwd}") - with open(os.path.join(cwd, 'hvigor/hvigor_cofig.json5'), 'r') as input_f: + with open(os.path.join(cwd, 'hvigor/hvigor-config.json5'), 'r') as input_f: hvigor_info = json5.load(input_f) dependencies = hvigor_info.get('dependencies') is_cj_project = "@ohos/cangjie-build-support" in dependencies.keys() -- Gitee