From 2ee331f235df89d979573f173e8fe361a89ca5f6 Mon Sep 17 00:00:00 2001 From: wangcaoyu Date: Wed, 19 Feb 2025 14:18:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9ohos=5Fdeclaration=5Fets?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangcaoyu --- BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index 9dd538cb9..88a5392a1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -336,7 +336,8 @@ ohos_copy("ohos_declaration_ets_ark") { deps += [ "//interface/sdk-js:ohos_declaration_ets" ] } - sources = [ root_out_dir + "/ohos_declaration/ohos_declaration_ets" ] + sources = + [ root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" ] outputs = [ target_out_dir + "/../api" ] } -- Gitee From b2f1eb6c2c9250c1b3cb0e7cce0f1ca095e970d1 Mon Sep 17 00:00:00 2001 From: Bojiang Date: Tue, 1 Apr 2025 20:46:35 +0800 Subject: [PATCH 2/5] jiangbo91@huawei.com Signed-off-by: Bojiang Change-Id: I808be817858899aa17ce1c732c94e69a980a70d8 --- BUILD.gn | 15 ++++++++++++--- compiler/build_declarations_file.js | 4 ++-- compiler/build_kitConfigs_file.js | 8 ++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 88a5392a1..8bf020a7a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,6 +14,7 @@ import("//build/ohos.gni") import("//build/ohos/ace/ace.gni") import("//build/ohos_var.gni") +import("//build/templates/bpf/ohos_bpf_config.gni") import("//foundation/arkui/ace_engine/ace_config.gni") if (sdk_build_public) { import("//out/sdk-public/public_interface/sdk-js/interface_config.gni") @@ -46,6 +47,11 @@ action("build_ets_loader_library") { ":install_arkguard_tsc", ":server", ] + if (sdk_build_public) { + deps += [ "//out/sdk-public/public_interface/sdk-js:ets_component" ] + } else { + deps += [ "//interface/sdk-js:ets_component" ] + } script = "build_ets_loader_library.py" depfile = "$target_gen_dir/$target_name.d" outputs = [ @@ -63,14 +69,17 @@ action("build_ets_loader_library") { } else { _ace_config_dir = "//prebuilts/ace-toolkit/ets-loader/compiler" } - _declarations_file_dir = "//interface/sdk-js/api/@internal/component/ets" + input_project_dir = "//interface/sdk-js" + if (sdk_build_public || product_name == "ohos-sdk") { + input_project_dir = "//out/sdk-public/public_interface/sdk-js" + } + _declarations_file_dir = + input_project_dir + "/ets/${bpf_inc_out_dir}/ets_component" _kit_configs_file_dir = "//interface/sdk-js/kits" _kit_apis_file_dir = "//interface/sdk-js/api" _arkts_apis_file_dir = "//interface/sdk-js/arkts" isPublic = "false" if (sdk_build_public) { - _declarations_file_dir = - "//out/sdk-public/public_interface/sdk-js/api/@internal/component/ets" _kit_configs_file_dir = "//out/sdk-public/public_interface/sdk-js/kits" _kit_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/api" _arkts_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/arkts" diff --git a/compiler/build_declarations_file.js b/compiler/build_declarations_file.js index 695d29691..d3f4782eb 100644 --- a/compiler/build_declarations_file.js +++ b/compiler/build_declarations_file.js @@ -36,8 +36,8 @@ const addTSAttributeSet = ['AlphabetIndexer', 'Animator', 'Badge', 'Blank', 'But generateTargetFile(process.argv[2], process.argv[3]); function generateTargetFile(filePath, output) { const files = []; - const globalTsFile = path.resolve(filePath, '../../ets/global.d.ts'); - const featureAbilityPath = path.resolve(filePath, '../../../common/full/featureability.d.ts'); + const globalTsFile = path.resolve(filePath, '../ets_internal_api/global.d.ts'); + const featureAbilityPath = path.resolve(filePath, '../internal_full/featureability.d.ts'); const middleTsFile = path.resolve(filePath, 'middle_class.d.ts'); if (fs.existsSync(globalTsFile)) { files.push(globalTsFile); diff --git a/compiler/build_kitConfigs_file.js b/compiler/build_kitConfigs_file.js index cdbfce6a5..af72535e1 100644 --- a/compiler/build_kitConfigs_file.js +++ b/compiler/build_kitConfigs_file.js @@ -104,7 +104,7 @@ function readFile(dir, fileDir) { const status = fs.statSync(filePath); if (status.isDirectory()) { readFile(filePath, fileDir); - } else { + } else if (filePath.endsWith('.d.ts')) { fileDir.push(filePath); } }); @@ -115,12 +115,16 @@ function readSystemApis(dir, fileDir) { files.forEach(file => { const filePath = path.join(dir, file); const status = fs.statSync(filePath); - if (!status.isDirectory()) { + if (!status.isDirectory() && !hasSameApi(filePath)) { fileDir.push(file); } }); } +function hasSameApi(filePath) { + return filePath.endsWith('.d.ets') && fs.existsSync(filePath.replace('.d.ets', '.d.ts')); +} + function mkDir(filePath) { const parent = path.join(filePath, '..'); if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { -- Gitee From 1bec610d8320a9851ad2fc3be68014cf7c31e6b2 Mon Sep 17 00:00:00 2001 From: wangcaoyu Date: Wed, 9 Apr 2025 20:55:45 +0800 Subject: [PATCH 3/5] reset ets1.2 Signed-off-by: wangcaoyu --- BUILD.gn | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 8bf020a7a..5d9a75bfe 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,11 +16,7 @@ import("//build/ohos/ace/ace.gni") import("//build/ohos_var.gni") import("//build/templates/bpf/ohos_bpf_config.gni") import("//foundation/arkui/ace_engine/ace_config.gni") -if (sdk_build_public) { - import("//out/sdk-public/public_interface/sdk-js/interface_config.gni") -} else { - import("//interface/sdk-js/interface_config.gni") -} +import("//interface/sdk-js/interface_config.gni") ets_loader_lib_dir = get_label_info(":build_ets_loader_library", "target_out_dir") + "/lib" @@ -39,6 +35,8 @@ ets_sysResource = get_label_info(":build_ets_sysResource", "target_out_dir") + "/sysResource.js" ets_loader_kit_configs_dir = get_label_info(":build_ets_loader_library", "target_out_dir") + "/kit_configs" +ets_component_dep = "//interface/sdk-js:ets_component" +ets_component_out_dir = get_label_info(ets_component_dep, "target_out_dir") action("build_ets_loader_library") { deps = [ @@ -46,12 +44,11 @@ action("build_ets_loader_library") { ":form_components", ":install_arkguard_tsc", ":server", + "//interface/sdk-js:ets_component", + "//interface/sdk-js:bundle_kits", + "//interface/sdk-js:bundle_arkts", + "//interface/sdk-js:ets_internal_api", ] - if (sdk_build_public) { - deps += [ "//out/sdk-public/public_interface/sdk-js:ets_component" ] - } else { - deps += [ "//interface/sdk-js:ets_component" ] - } script = "build_ets_loader_library.py" depfile = "$target_gen_dir/$target_name.d" outputs = [ @@ -69,22 +66,10 @@ action("build_ets_loader_library") { } else { _ace_config_dir = "//prebuilts/ace-toolkit/ets-loader/compiler" } - input_project_dir = "//interface/sdk-js" - if (sdk_build_public || product_name == "ohos-sdk") { - input_project_dir = "//out/sdk-public/public_interface/sdk-js" - } - _declarations_file_dir = - input_project_dir + "/ets/${bpf_inc_out_dir}/ets_component" - _kit_configs_file_dir = "//interface/sdk-js/kits" - _kit_apis_file_dir = "//interface/sdk-js/api" - _arkts_apis_file_dir = "//interface/sdk-js/arkts" - isPublic = "false" - if (sdk_build_public) { - _kit_configs_file_dir = "//out/sdk-public/public_interface/sdk-js/kits" - _kit_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/api" - _arkts_apis_file_dir = "//out/sdk-public/public_interface/sdk-js/arkts" - isPublic = "true" - } + _declarations_file_dir = ets_component_out_dir + "/${sdk_type}/ets_component" + _kit_configs_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_kits" + _kit_apis_file_dir = root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" + _arkts_apis_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_arkts" _babel_js = _ace_config_dir + "/node_modules/@babel/cli/bin/babel.js" _babel_config_js = _ace_config_dir + "/babel.config.js" @@ -148,7 +133,7 @@ action("build_ets_loader_library") { "--arkts-apis-file-dir", rebase_path(_arkts_apis_file_dir, root_build_dir), "--build-public-sdk", - isPublic, + "${sdk_build_public}", ] } @@ -338,12 +323,7 @@ ohos_copy("ets_loader_ark_codegen") { } ohos_copy("ohos_declaration_ets_ark") { - deps = [] - if (sdk_build_public) { - deps += [ "//out/sdk-public/public_interface/sdk-js:ohos_declaration_ets" ] - } else { - deps += [ "//interface/sdk-js:ohos_declaration_ets" ] - } + deps = [ "//interface/sdk-js:ohos_declaration_ets" ] sources = [ root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" ] -- Gitee From 7f86f0e00fb9a4fb4baf8bdc0e00abc6030a369f Mon Sep 17 00:00:00 2001 From: wangcaoyu Date: Sun, 27 Apr 2025 12:14:03 +0800 Subject: [PATCH 4/5] remove common_api Signed-off-by: wangcaoyu --- BUILD.gn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 5d9a75bfe..26f24c05a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -331,8 +331,7 @@ ohos_copy("ohos_declaration_ets_ark") { outputs = [ target_out_dir + "/../api" ] } -ohos_copy("ets_loader_ark_hap") { - sources = common_api_src +group("ets_loader_ark_hap") { deps = [ ":ets_loader_ark", ":ets_loader_ark_codegen", @@ -343,8 +342,6 @@ ohos_copy("ets_loader_ark_hap") { ":ets_loader_ark_server", ":ohos_declaration_ets_ark", ] - outputs = [ target_out_dir + "/../../developtools/api/{{source_file_part}}" ] - module_install_name = "" } typescript_dir = get_label_info("//third_party/typescript:build_typescript", -- Gitee From 8e32504f8350dc3be2baa0ac9d4450283e84dc29 Mon Sep 17 00:00:00 2001 From: yangbo_404 Date: Thu, 5 Jun 2025 12:40:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8DGN=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangbo_404 --- BUILD.gn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 26f24c05a..9023cf7d3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -44,9 +44,9 @@ action("build_ets_loader_library") { ":form_components", ":install_arkguard_tsc", ":server", - "//interface/sdk-js:ets_component", - "//interface/sdk-js:bundle_kits", "//interface/sdk-js:bundle_arkts", + "//interface/sdk-js:bundle_kits", + "//interface/sdk-js:ets_component", "//interface/sdk-js:ets_internal_api", ] script = "build_ets_loader_library.py" @@ -68,7 +68,8 @@ action("build_ets_loader_library") { } _declarations_file_dir = ets_component_out_dir + "/${sdk_type}/ets_component" _kit_configs_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_kits" - _kit_apis_file_dir = root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" + _kit_apis_file_dir = + root_out_dir + "/ohos_declaration/${sdk_type}/ohos_declaration_ets" _arkts_apis_file_dir = ets_component_out_dir + "/${sdk_type}/bundle_arkts" _babel_js = _ace_config_dir + "/node_modules/@babel/cli/bin/babel.js" -- Gitee