diff --git a/BUILD.gn b/BUILD.gn index 1245c4acb615e003186aca4d3a62ff0ec271cec8..31fd6d5a7b8d4b1f028fc35e3711a5ca9e33f8ad 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -168,43 +168,43 @@ template("ohos_handle_declaration_template") { } # 最终打包SDK ets/api执行脚本 -ohos_handle_declaration_template("ohos_build_ets_sdk_api") { +ohos_handle_declaration_template("ohos_build_dynamic_sdk_api") { sdk_type = "ets" input_project_dir = "$ohos_ets_dynamic_path/api" } # 最终打包SDK ets/arkts执行脚本 -ohos_handle_declaration_template("ohos_build_ets_sdk_arkts") { +ohos_handle_declaration_template("ohos_build_dynamic_sdk_arkts") { sdk_type = "ets" input_project_dir = "$ohos_ets_dynamic_path/arkts" } # 最终打包SDK ets/component执行脚本 -ohos_handle_declaration_template("ohos_build_ets_sdk_component") { +ohos_handle_declaration_template("ohos_build_dynamic_sdk_component") { sdk_type = "ets" input_project_dir = "$ohos_ets_dynamic_path/component" } # 最终打包SDK ets/kits执行脚本 -ohos_handle_declaration_template("ohos_build_ets_sdk_kits") { +ohos_handle_declaration_template("ohos_build_dynamic_sdk_kits") { sdk_type = "ets" input_project_dir = "$ohos_ets_dynamic_path/kits" } # 最终打包SDK ets2/api执行脚本 -ohos_handle_declaration_template("ohos_build_ets2_sdk_api") { +ohos_handle_declaration_template("ohos_build_static_sdk_api") { sdk_type = "ets2" input_project_dir = "$ohos_ets_static_path/api" } # 最终打包SDK ets2/arkts执行脚本 -ohos_handle_declaration_template("ohos_build_ets2_sdk_arkts") { +ohos_handle_declaration_template("ohos_build_static_sdk_arkts") { sdk_type = "ets2" input_project_dir = "$ohos_ets_static_path/arkts" } # 最终打包SDK ets2/kits执行脚本 -ohos_handle_declaration_template("ohos_build_ets2_sdk_kits") { +ohos_handle_declaration_template("ohos_build_static_sdk_kits") { sdk_type = "ets2" input_project_dir = "$ohos_ets_static_path/kits" } @@ -235,14 +235,14 @@ ohos_copy_internal("bundle_arkts") { input_project_dir = interface_sdk_path_ets1 } -# ets1.2/arkts执行脚本 -ohos_copy_internal("bundle_arkts_ets1.2") { +# static/arkts执行脚本 +ohos_copy_internal("bundle_arkts_static") { sdk_type = "ets2" iv_input = interface_sdk_path_ets2 + "/arkts" input_project_dir = interface_sdk_path_ets2 } -ohos_copy_internal("ets_internal_api2") { +ohos_copy_internal("ets_internal_api_static") { sdk_type = "ets2" iv_input = interface_sdk_path_ets2 + "/api/@internal/ets" input_project_dir = interface_sdk_path_ets2 @@ -261,7 +261,7 @@ if (!sdk_build_public) { } } -# ets/component执行脚本 +# dynamic/component执行脚本 ohos_copy_internal("ets_component") { sdk_type = "ets" iv_input = interface_sdk_path_ets1 + "/api/@internal/component/ets" @@ -269,8 +269,8 @@ ohos_copy_internal("ets_component") { } -# ets1.2/arkui/component执行脚本 -ohos_copy_internal("ets_component2") { +# static/arkui/component执行脚本 +ohos_copy_internal("ets_component_static") { sdk_type = "ets2" iv_input = interface_sdk_path + "/arkui_transformer_api" input_project_dir = interface_sdk_path @@ -285,7 +285,7 @@ ohos_copy_internal("bundle_kits") { # ets2/kits执行脚本 -ohos_copy_internal("bundle_kits2") { +ohos_copy_internal("bundle_kits_static") { sdk_type = "ets2" iv_input = interface_sdk_path_ets2 + "/kits" input_project_dir = interface_sdk_path_ets2 @@ -340,35 +340,35 @@ ohos_copy("syscap_check") { module_install_name = "" } -# 处理ets1.1的interop +# 处理dynamic的interop ohos_copy("build_dynamic_sdk_interop") { - deps = [ ":build_sdk_interop1", ":ohos_ets_process_interop" ] - sources = [ "${interface_sdk_path}/ets1.1interop"] + deps = [ ":build_dynamic_sdk_interop", ":ohos_ets_process_interop" ] + sources = [ "${interface_sdk_path}/dynamic-interop"] outputs=[ target_out_dir + "/${target_name}" ] module_source_dir = target_out_dir + "/${target_name}" module_install_name = "" } -# 处理ets1.2 声明文件的interop +# 处理static 声明文件的interop ohos_copy("build_static_declaration_sdk_interop") { - deps = [ ":build_sdk_interop2", ":ohos_ets_process_interop" ] - sources = [ "${interface_sdk_path}/ets1.2interop/declaration"] + deps = [ ":build_static_sdk_interop", ":ohos_ets_process_interop" ] + sources = [ "${interface_sdk_path}/static-interop/declaration"] outputs=[ target_out_dir + "/${target_name}" ] module_source_dir = target_out_dir + "/${target_name}" module_install_name = "" } -# 处理ets1.2 胶水代码的interop +# 处理static 胶水代码的interop ohos_copy("build_static_bridge_sdk_interop") { - deps = [ ":build_sdk_interop2", ":ohos_ets_process_interop" ] - sources = [ "${interface_sdk_path}/ets1.2interop/bridge"] + deps = [ ":build_static_sdk_interop", ":ohos_ets_process_interop" ] + sources = [ "${interface_sdk_path}/static-interop/bridge"] outputs=[ target_out_dir + "/${target_name}" ] module_source_dir = target_out_dir + "/${target_name}" module_install_name = "" } -# 将ets1.2文件处理成ets1.2interop -action("build_sdk_interop2") { +# 将static文件处理成static-interop +action("build_static_sdk_interop") { interface_sdk_interop2_deps = "" if (host_toolchain == toolchain_mac) { interface_sdk_interop2_deps = ":build_ohos_ets($toolchain_mac)" @@ -402,12 +402,12 @@ action("build_sdk_interop2") { rebase_path(node_path, root_build_dir) ] outputs = [ - interface_sdk_path + "/ets1.2interop/declaration", - interface_sdk_path + "/ets1.2interop/bridge" + interface_sdk_path + "/static-interop/declaration", + interface_sdk_path + "/static-interop/bridge" ] } -# 运行处理ets1.2interop工具所需要的依赖 +# 运行处理static-interop工具所需要的依赖 group("build_ohos_ets") { external_deps = [ ohos_ets_build_system_deps, @@ -425,8 +425,8 @@ group("build_ohos_ets") { ] } -# 将ets1.1文件处理成ets1.1interop -action("build_sdk_interop1") { +# 将dynamic文件处理成dynamic-interop +action("build_dynamic_sdk_interop") { deps = [ ":ohos_base_split", ":ohos_ets_dynamic" @@ -450,7 +450,7 @@ action("build_sdk_interop1") { "--node-js", rebase_path(nodejs, root_build_dir), ] - outputs = [ "${interface_sdk_path}/ets1.1interop" ] + outputs = [ "${interface_sdk_path}/dynamic-interop" ] } ohos_copy("ohos_ets_dynamic_api_declaration") { @@ -494,22 +494,22 @@ ohos_copy("ohos_ets_static_api_declaration") { ohos_copy("ohos_ets_static_api_internal") { deps = [ - ":ets_internal_api2", + ":ets_internal_api_static", ":ohos_ets_static_api_declaration" ] - sources = [ target_out_dir + "/ets2/ets_internal_api2" ] + sources = [ target_out_dir + "/ets2/ets_internal_api_static" ] outputs = [ ohos_ets_static_api_path + "/@internal/full" ] } ohos_copy("ohos_ets_static_arkts") { - deps = [ ":bundle_arkts_ets1.2" ] - sources = [ target_out_dir + "/ets2/bundle_arkts_ets1.2" ] + deps = [ ":bundle_arkts_static" ] + sources = [ target_out_dir + "/ets2/bundle_arkts_static" ] outputs = [ ohos_ets_static_arkts_path ] } action("ohos_ets_static_component") { deps = [ - ":ets_component2", + ":ets_component_static", ":ohos_ets_static_api_declaration" ] script = "//interface/sdk-js/process_internal.py" @@ -533,8 +533,8 @@ action("ohos_ets_static_component") { } ohos_copy("ohos_ets_static_kits") { - deps = [ ":bundle_kits2" ] - sources = [ target_out_dir + "/ets2/bundle_kits2" ] + deps = [ ":bundle_kits_static" ] + sources = [ target_out_dir + "/ets2/bundle_kits_static" ] outputs = [ ohos_ets_static_kits_path ] } @@ -566,7 +566,7 @@ ohos_copy("ohos_ets_kits") { subsystem_name = "sdk" } -# ets1.1 interop工具的SDK输入 +# dynamic interop工具的SDK输入 group("ohos_ets_dynamic") { deps = [ ":ohos_ets_dynamic_api_declaration", @@ -605,7 +605,7 @@ ohos_copy("api_check_plugin") { module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } -# ets1.2 interop工具的SDK输入 +# static interop工具的SDK输入 group("ohos_ets_static") { deps = [ ":ohos_ets_static_api_declaration", @@ -618,8 +618,8 @@ group("ohos_ets_static") { action("ohos_ets_process_interop") { deps = [ - ":build_sdk_interop1", - ":build_sdk_interop2" + ":build_dynamic_sdk_interop", + ":build_static_sdk_interop" ] script = "process_label_noninterop.py" args = [ diff --git a/compile_ets_ts.py b/compile_ets_ts.py index 1d368e7f78c8961a1e7b2599fc5fcbd0456c1481..6c48aa3fa063ee70dd6aaaf3fd0a53331db90efa 100755 --- a/compile_ets_ts.py +++ b/compile_ets_ts.py @@ -29,8 +29,8 @@ INTEROP_ETS_LIST = ["api", "arkts", "kits"] OUTPUT_PATH = '' # 需要排除的文件 CONFIG_JSON = "interface/sdk-js/compile_ets_ts.json" -# ets1.2命名 -INTEROP_NAME = "ets1.2interop" +# static命名 +INTEROP_NAME = "static-interop" def should_exclude(path, config): @@ -125,8 +125,8 @@ def run_compile_ets_ts(tool_dir: str, node_path: str, config_json_path: str, out env = os.environ.copy() env["LD_LIBRARY_PATH"] = str(panda_path) try: - interop_path_declaration = os.path.join(out_interop_path, "ets1.2interop/declaration") - interop_path_bridge = os.path.join(out_interop_path, "ets1.2interop/bridge") + interop_path_declaration = os.path.join(out_interop_path, "static-interop/declaration") + interop_path_bridge = os.path.join(out_interop_path, "static-interop/bridge") os.makedirs(interop_path_declaration, exist_ok=True) os.makedirs(interop_path_bridge, exist_ok=True) cmd = [node_path, tool_path, json_path] diff --git a/process_label_noninterop.py b/process_label_noninterop.py index ac8cd8ee622a5741f73520675528243bc8b841ab..a745a76b6fdf1b8ac31520c33b1f01eb7d65c45d 100755 --- a/process_label_noninterop.py +++ b/process_label_noninterop.py @@ -82,9 +82,9 @@ def main(): parser.add_argument('--node-js', required=True) options = parser.parse_args() - process_interop(options, "/ets1.1interop/api", "/ets1.1interop/api", "false") - process_interop(options, "/ets1.1interop/component", "/ets1.1interop/component", "true") - process_interop(options, "/ets1.2interop/declaration/api", "/ets1.2interop/declaration/api", "false") + process_interop(options, "/dynamic-interop/api", "/dynamic-interop/api", "false") + process_interop(options, "/dynamic-interop/component", "/dynamic-interop/component", "true") + process_interop(options, "/static-interop/declaration/api", "/static-interop/declaration/api", "false") process_global_import(options, "/ets1.1interop/api", "/ets1.1interop/api", "false") diff --git a/run_compile_declgen.py b/run_compile_declgen.py index f18f41880b2b06366ce9bcad01cb7e2287a1a49d..11cc33353f2978f0104332c1d80d0d0e18a7881d 100755 --- a/run_compile_declgen.py +++ b/run_compile_declgen.py @@ -39,7 +39,7 @@ def ensure_dir_exists(target_path): def traverse_function(source_root_dir: str, input_path: str, out_interop_path: str, node_js: str): source_root_dir = os.path.abspath(source_root_dir) input_dir = os.path.abspath(input_path) - out_path = os.path.abspath(os.path.join(out_interop_path, 'ets1.1interop')) + out_path = os.path.abspath(os.path.join(out_interop_path, 'dynamic-interop')) package_path = os.path.abspath(os.path.join(source_root_dir, PACKAGE_PATH)) nodejs = os.path.abspath(node_js) output_dir = ensure_dir_exists(out_path)