From 0c9b4401c991c36bb7d2165df69de8a4d0839278 Mon Sep 17 00:00:00 2001 From: Hu Yueh-Wei Date: Mon, 20 Jan 2025 10:48:54 +0800 Subject: [PATCH] chore: refine build scripts (#569) --- ...eplace_normal_files_or_merge_json_files.py | 54 ++++++--------- build/ten_runtime/feature/test.gni | 55 ++++----------- core/ten_gn | 2 +- .../ffmpeg_demuxer/BUILD.gn | 2 +- .../integration/common/build_pkg.py | 24 +++---- .../ten_runtime/integration/common/replace.py | 69 ++++++------------- .../integration/cpp/large_result/BUILD.gn | 1 + .../integration/cpp/multi_apps/BUILD.gn | 18 ++++- .../go/access_property_go/BUILD.gn | 5 +- .../integration/go/expired_ten_go/BUILD.gn | 12 +++- .../go/frequently_cgo_call_go/BUILD.gn | 9 ++- .../integration/go/handle_error_go/BUILD.gn | 9 ++- .../integration/go/no_dest_go/BUILD.gn | 5 +- .../go/prepare_to_stop_go/BUILD.gn | 13 +++- .../integration/go/return_result_go/BUILD.gn | 9 ++- .../integration/go/return_value_go/BUILD.gn | 12 +++- .../go/send_audio_frame_go/BUILD.gn | 5 +- .../integration/go/send_data_go/BUILD.gn | 5 +- .../go/send_video_frame_go/BUILD.gn | 5 +- .../go/three_extension_cmd_go/BUILD.gn | 13 +++- .../go/transfer_pointer_go/BUILD.gn | 12 +++- .../two_extension_one_group_cmd_go/BUILD.gn | 9 ++- .../nodejs/mix_python_ext_nodejs/BUILD.gn | 2 +- .../cpp_app_multi_process_python/BUILD.gn | 3 +- .../python/cpp_app_python/BUILD.gn | 3 +- .../go_app_async_extension_python/BUILD.gn | 2 +- .../python/go_app_cythonize/BUILD.gn | 9 ++- .../go_app_partially_cythonize/BUILD.gn | 10 ++- .../integration/python/go_app_python/BUILD.gn | 2 +- .../python/send_cmd_python/BUILD.gn | 2 +- 30 files changed, 211 insertions(+), 170 deletions(-) diff --git a/build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py b/build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py index d71d3526a3..e2526f2ca6 100644 --- a/build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py +++ b/build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py @@ -13,7 +13,8 @@ class ArgumentInfo(argparse.Namespace): def __init__(self): - self.replaced_files: list[str] + self.src: str + self.dest: str def merge_json_file_at_root_level(src: str, dest: str) -> None: @@ -43,46 +44,31 @@ def merge_json_file_at_root_level(src: str, dest: str) -> None: dest_file.truncate() -def split(input: str, split_key: str) -> tuple[str, str]: - split_key_index = str(input).find(split_key) - if split_key_index == -1: - # split_key is not found, this means the source and the destination - # are equal. - return (input, input) - else: - return ( - str(input)[:split_key_index], - str(input)[split_key_index + len(split_key) :], - ) - +def replace_normal_files_or_merge_json_files(src: str, dest: str) -> None: + if not os.path.exists(src): + raise Exception(f"{src} does not exist.") -def replace_normal_files_or_merge_json_files(replaced_files: list[str]) -> None: - for res in replaced_files: - src, dest = split(res, "=>") + if os.path.isdir(src): + raise Exception(f"{src} is a directory, not a file.") - if not os.path.exists(src): - raise Exception(f"{src} does not exist.") + if os.path.exists(dest) and os.path.isdir(dest): + raise Exception(f"{dest} is a directory, not a file.") - if ( - src.endswith(".json") - and dest.endswith(".json") - and os.path.exists(dest) - ): - merge_json_file_at_root_level(src, dest) - else: - fs_utils.copy(src, dest) + if ( + src.endswith(".json") + and dest.endswith(".json") + and os.path.exists(dest) + ): + merge_json_file_at_root_level(src, dest) + else: + fs_utils.copy(src, dest) if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument( - "--replaced-files", - type=str, - action="append", - default=[], - help="Resources to be replaced", - ) + parser.add_argument("--src", type=str, required=True) + parser.add_argument("--dest", type=str, required=True) arg_info = ArgumentInfo() args = parser.parse_args(namespace=arg_info) @@ -91,7 +77,7 @@ def replace_normal_files_or_merge_json_files(replaced_files: list[str]) -> None: returncode = 0 try: - replace_normal_files_or_merge_json_files(args.replaced_files) + replace_normal_files_or_merge_json_files(args.src, args.dest) except Exception as exc: returncode = 1 print(exc) diff --git a/build/ten_runtime/feature/test.gni b/build/ten_runtime/feature/test.gni index a397c8edd7..a9bb89522a 100644 --- a/build/ten_runtime/feature/test.gni +++ b/build/ten_runtime/feature/test.gni @@ -117,24 +117,8 @@ template("ten_package_test_prepare_app") { replace_path_index = 0 foreach(replace_path, invoker.replace_paths_after_install_app) { - replace_path_info = { - } - - replace_path_info = - exec_script("//.gnfiles/build/scripts/get_src_and_dest_file.py", - [ - "--input-string", - replace_path, - "--src-dest-delimiter", - "=>", - "--src-base-delimiter", - ":", - ], - "json") - - replace_src_path = replace_path_info.source - replace_dest_path = - "${test_case_out_dir_rel_path}/${replace_path_info.destination}" + replace_src_path = replace_path + replace_dest_path = "${test_case_out_dir_rel_path}/${replace_path}" replace_src_abs_path = rebase_path(replace_src_path) replace_dest_abs_path = rebase_path(replace_dest_path) @@ -144,12 +128,12 @@ template("ten_package_test_prepare_app") { script = "//build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py" args = [ - "--replaced-files", - "${replace_src_abs_path}=>${replace_dest_abs_path}", + "--src", + "${replace_src_abs_path}", + "--dest", + "${replace_dest_abs_path}", ] - # Wait for the completion of 'install_app'. - inputs = [] sources = [ replace_src_path ] outputs = [ replace_dest_path ] @@ -236,24 +220,8 @@ template("ten_package_test_prepare_app") { replace_path_index = 0 foreach(replace_path, invoker.replace_paths_after_install_all) { - replace_path_info = { - } - - replace_path_info = - exec_script("//.gnfiles/build/scripts/get_src_and_dest_file.py", - [ - "--input-string", - replace_path, - "--src-dest-delimiter", - "=>", - "--src-base-delimiter", - ":", - ], - "json") - - replace_src_path = replace_path_info.source - replace_dest_path = - "${test_case_out_dir_rel_path}/${replace_path_info.destination}" + replace_src_path = replace_path + replace_dest_path = "${test_case_out_dir_rel_path}/${replace_path}" replace_src_abs_path = rebase_path(replace_src_path) replace_dest_abs_path = rebase_path(replace_dest_path) @@ -261,9 +229,12 @@ template("ten_package_test_prepare_app") { action( "${test_case_unique_target_name}_${_target_name}_after_install_all_replace_file_${replace_path_index}") { script = "//build/ten_runtime/feature/replace_normal_files_or_merge_json_files.py" + args = [ - "--replaced-files", - "${replace_src_abs_path}=>${replace_dest_abs_path}", + "--src", + "${replace_src_abs_path}", + "--dest", + "${replace_dest_abs_path}", ] sources = [ replace_src_path ] diff --git a/core/ten_gn b/core/ten_gn index 330f0d67c5..210a40b609 160000 --- a/core/ten_gn +++ b/core/ten_gn @@ -1 +1 @@ -Subproject commit 330f0d67c5ef4f482306f5faa3449a1accff40fe +Subproject commit 210a40b6095381932547a5711d1eb239bae61cf9 diff --git a/packages/example_extensions/ffmpeg_demuxer/BUILD.gn b/packages/example_extensions/ffmpeg_demuxer/BUILD.gn index 88efb6d7e0..c28883f7aa 100644 --- a/packages/example_extensions/ffmpeg_demuxer/BUILD.gn +++ b/packages/example_extensions/ffmpeg_demuxer/BUILD.gn @@ -16,7 +16,7 @@ ten_package("ffmpeg_demuxer") { resources = [ "manifest.json", "property.json", - "res", + "res/test.mp4", ] sources = [ diff --git a/tests/ten_runtime/integration/common/build_pkg.py b/tests/ten_runtime/integration/common/build_pkg.py index 2ed1b909e0..c6f503abd4 100644 --- a/tests/ten_runtime/integration/common/build_pkg.py +++ b/tests/ten_runtime/integration/common/build_pkg.py @@ -357,7 +357,6 @@ def _replace_after_install_app( ): return 0 - replaced_files = [] for replace_file in replace_paths_after_install_app: src_file = os.path.join( assemble_info_dir, @@ -370,13 +369,12 @@ def _replace_after_install_app( return 1 dst_file = os.path.join(test_case_base_dir, replace_file) - replaced_files.append((src_file, dst_file)) - try: - replace.replace_normal_files_or_merge_json_files(replaced_files) - except Exception as exc: - print(exc) - return 1 + try: + replace.replace_normal_files_or_merge_json_files(src_file, dst_file) + except Exception as exc: + print(exc) + return 1 return 0 @@ -403,7 +401,6 @@ def _replace_after_install_all( ): return 0 - replaced_files = [] for replace_file in replace_paths_after_install_all: src_file = os.path.join( assemble_info_dir, @@ -416,13 +413,12 @@ def _replace_after_install_all( return 1 dst_file = os.path.join(test_case_base_dir, replace_file) - replaced_files.append((src_file, dst_file)) - try: - replace.replace_normal_files_or_merge_json_files(replaced_files) - except Exception as exc: - print(exc) - return 1 + try: + replace.replace_normal_files_or_merge_json_files(src_file, dst_file) + except Exception as exc: + print(exc) + return 1 return 0 diff --git a/tests/ten_runtime/integration/common/replace.py b/tests/ten_runtime/integration/common/replace.py index bc84f27af4..b0eb22e4b2 100644 --- a/tests/ten_runtime/integration/common/replace.py +++ b/tests/ten_runtime/integration/common/replace.py @@ -13,7 +13,8 @@ class ArgumentInfo(argparse.Namespace): def __init__(self): - self.replaced_files: list[str] + self.src: str + self.dest: str def merge_json_file_at_root_level(src: str, dest: str) -> None: @@ -43,59 +44,31 @@ def merge_json_file_at_root_level(src: str, dest: str) -> None: dest_file.truncate() -def split(input: str, split_key: str) -> tuple[str, str]: - split_key_index = str(input).find(split_key) - if split_key_index == -1: - # split_key is not found, this means the source and the destination - # are equal. - return (input, input) - else: - return ( - str(input)[:split_key_index], - str(input)[split_key_index + len(split_key) :], - ) - - -def _parsing_replace_files( - replaced_files: list[str], -) -> list[tuple[str, str]]: - result = [] - for res in replaced_files: - res_src, res_dest = split(res, "=>") - result.append((res_src, res_dest)) - - return result - +def replace_normal_files_or_merge_json_files(src: str, dest: str) -> None: + if not os.path.exists(src): + raise Exception(f"{src} does not exist.") -def replace_normal_files_or_merge_json_files( - replaced_files: list[tuple[str, str]] -) -> None: - for res in replaced_files: - res_src, res_dest = res + if os.path.isdir(src): + raise Exception(f"{src} is a directory, not a file.") - if not os.path.exists(res_src): - raise Exception(f"{res_src} does not exist.") + if os.path.exists(dest) and os.path.isdir(dest): + raise Exception(f"{dest} is a directory, not a file.") - if ( - res_src.endswith(".json") - and res_dest.endswith(".json") - and os.path.exists(res_dest) - ): - merge_json_file_at_root_level(res_src, res_dest) - else: - fs_utils.copy(res_src, res_dest) + if ( + src.endswith(".json") + and dest.endswith(".json") + and os.path.exists(dest) + ): + merge_json_file_at_root_level(src, dest) + else: + fs_utils.copy(src, dest) if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument( - "--replaced-files", - type=str, - action="append", - default=[], - help="Resources to be replaced", - ) + parser.add_argument("--src", type=str, required=True) + parser.add_argument("--dest", type=str, required=True) arg_info = ArgumentInfo() args = parser.parse_args(namespace=arg_info) @@ -104,9 +77,7 @@ def replace_normal_files_or_merge_json_files( returncode = 0 try: - replace_normal_files_or_merge_json_files( - _parsing_replace_files(args.replaced_files) - ) + replace_normal_files_or_merge_json_files(args.src, args.dest) except Exception as exc: returncode = 1 print(exc) diff --git a/tests/ten_runtime/integration/cpp/large_result/BUILD.gn b/tests/ten_runtime/integration/cpp/large_result/BUILD.gn index b21b8d4ac5..a3d3089502 100644 --- a/tests/ten_runtime/integration/cpp/large_result/BUILD.gn +++ b/tests/ten_runtime/integration/cpp/large_result/BUILD.gn @@ -20,6 +20,7 @@ ten_package_test_prepare_app("large_result_app") { replace_paths_after_install_all = [ "large_result_app/ten_packages/extension/default_extension_cpp/src/main.cc", ] + if (ten_enable_ten_manager) { deps = [ "//core/src/ten_manager", diff --git a/tests/ten_runtime/integration/cpp/multi_apps/BUILD.gn b/tests/ten_runtime/integration/cpp/multi_apps/BUILD.gn index 009f2b9d33..9f038f7ba3 100644 --- a/tests/ten_runtime/integration/cpp/multi_apps/BUILD.gn +++ b/tests/ten_runtime/integration/cpp/multi_apps/BUILD.gn @@ -15,7 +15,14 @@ ten_package_test_prepare_app("app_1") { replace_paths_after_install_app = [ "app_1/manifest.json", "app_1/property.json", - "app_1/ten_packages", + "app_1/ten_packages/extension/ext_a/src/main.cc", + "app_1/ten_packages/extension/ext_a/BUILD.gn", + "app_1/ten_packages/extension/ext_a/manifest.json", + "app_1/ten_packages/extension/ext_a/property.json", + "app_1/ten_packages/extension/ext_b/src/main.cc", + "app_1/ten_packages/extension/ext_b/BUILD.gn", + "app_1/ten_packages/extension/ext_b/manifest.json", + "app_1/ten_packages/extension/ext_b/property.json", ] if (ten_enable_ten_manager) { @@ -37,7 +44,14 @@ ten_package_test_prepare_app("app_2") { replace_paths_after_install_app = [ "app_2/manifest.json", "app_2/property.json", - "app_2/ten_packages", + "app_2/ten_packages/extension/ext_c/src/main.cc", + "app_2/ten_packages/extension/ext_c/BUILD.gn", + "app_2/ten_packages/extension/ext_c/manifest.json", + "app_2/ten_packages/extension/ext_c/property.json", + "app_2/ten_packages/extension/ext_d/src/main.cc", + "app_2/ten_packages/extension/ext_d/BUILD.gn", + "app_2/ten_packages/extension/ext_d/manifest.json", + "app_2/ten_packages/extension/ext_d/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/access_property_go/BUILD.gn b/tests/ten_runtime/integration/go/access_property_go/BUILD.gn index 3228eb6c02..bc0319ac59 100644 --- a/tests/ten_runtime/integration/go/access_property_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/access_property_go/BUILD.gn @@ -15,7 +15,10 @@ ten_package_test_prepare_app("access_property_go_app") { replace_paths_after_install_app = [ "access_property_go_app/manifest.json", "access_property_go_app/property.json", - "access_property_go_app/ten_packages", + "access_property_go_app/ten_packages/extension/extension_a/extension.go", + "access_property_go_app/ten_packages/extension/extension_a/go.mod", + "access_property_go_app/ten_packages/extension/extension_a/manifest.json", + "access_property_go_app/ten_packages/extension/extension_a/property.json", ] deps = [ diff --git a/tests/ten_runtime/integration/go/expired_ten_go/BUILD.gn b/tests/ten_runtime/integration/go/expired_ten_go/BUILD.gn index bf992aaa0a..df09d5b952 100644 --- a/tests/ten_runtime/integration/go/expired_ten_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/expired_ten_go/BUILD.gn @@ -15,8 +15,16 @@ ten_package_test_prepare_app("expired_ten_go_app") { replace_paths_after_install_app = [ "expired_ten_go_app/manifest.json", "expired_ten_go_app/property.json", - "expired_ten_go_app/ten_packages", - "expired_ten_go_app/go_common_dep", + "expired_ten_go_app/ten_packages/extension/extension_a/extension.go", + "expired_ten_go_app/ten_packages/extension/extension_a/go.mod", + "expired_ten_go_app/ten_packages/extension/extension_a/manifest.json", + "expired_ten_go_app/ten_packages/extension/extension_a/property.json", + "expired_ten_go_app/ten_packages/extension/extension_b/extension.go", + "expired_ten_go_app/ten_packages/extension/extension_b/go.mod", + "expired_ten_go_app/ten_packages/extension/extension_b/manifest.json", + "expired_ten_go_app/ten_packages/extension/extension_b/property.json", + "expired_ten_go_app/go_common_dep/go.mod", + "expired_ten_go_app/go_common_dep/types/data.go", "expired_ten_go_app/go.mod", ] diff --git a/tests/ten_runtime/integration/go/frequently_cgo_call_go/BUILD.gn b/tests/ten_runtime/integration/go/frequently_cgo_call_go/BUILD.gn index 7e67d90c38..cd57c2b0c2 100644 --- a/tests/ten_runtime/integration/go/frequently_cgo_call_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/frequently_cgo_call_go/BUILD.gn @@ -15,7 +15,14 @@ ten_package_test_prepare_app("frequently_cgo_call_go_app") { replace_paths_after_install_app = [ "frequently_cgo_call_go_app/manifest.json", "frequently_cgo_call_go_app/property.json", - "frequently_cgo_call_go_app/ten_packages", + "frequently_cgo_call_go_app/ten_packages/extension/extension_a/extension.go", + "frequently_cgo_call_go_app/ten_packages/extension/extension_a/go.mod", + "frequently_cgo_call_go_app/ten_packages/extension/extension_a/manifest.json", + "frequently_cgo_call_go_app/ten_packages/extension/extension_a/property.json", + "frequently_cgo_call_go_app/ten_packages/extension/extension_b/extension.go", + "frequently_cgo_call_go_app/ten_packages/extension/extension_b/go.mod", + "frequently_cgo_call_go_app/ten_packages/extension/extension_b/manifest.json", + "frequently_cgo_call_go_app/ten_packages/extension/extension_b/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/handle_error_go/BUILD.gn b/tests/ten_runtime/integration/go/handle_error_go/BUILD.gn index d17a546787..4b36f33c3b 100644 --- a/tests/ten_runtime/integration/go/handle_error_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/handle_error_go/BUILD.gn @@ -15,7 +15,14 @@ ten_package_test_prepare_app("handle_error_go_app") { replace_paths_after_install_app = [ "handle_error_go_app/manifest.json", "handle_error_go_app/property.json", - "handle_error_go_app/ten_packages", + "handle_error_go_app/ten_packages/extension/extension_a/extension.go", + "handle_error_go_app/ten_packages/extension/extension_a/go.mod", + "handle_error_go_app/ten_packages/extension/extension_a/manifest.json", + "handle_error_go_app/ten_packages/extension/extension_a/property.json", + "handle_error_go_app/ten_packages/extension/extension_b/extension.go", + "handle_error_go_app/ten_packages/extension/extension_b/go.mod", + "handle_error_go_app/ten_packages/extension/extension_b/manifest.json", + "handle_error_go_app/ten_packages/extension/extension_b/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/no_dest_go/BUILD.gn b/tests/ten_runtime/integration/go/no_dest_go/BUILD.gn index 0d961b91fd..641dd79584 100644 --- a/tests/ten_runtime/integration/go/no_dest_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/no_dest_go/BUILD.gn @@ -15,7 +15,10 @@ ten_package_test_prepare_app("no_dest_go_app") { replace_paths_after_install_app = [ "no_dest_go_app/manifest.json", "no_dest_go_app/property.json", - "no_dest_go_app/ten_packages", + "no_dest_go_app/ten_packages/extension/extension_a/extension.go", + "no_dest_go_app/ten_packages/extension/extension_a/go.mod", + "no_dest_go_app/ten_packages/extension/extension_a/manifest.json", + "no_dest_go_app/ten_packages/extension/extension_a/property.json", ] deps = [ diff --git a/tests/ten_runtime/integration/go/prepare_to_stop_go/BUILD.gn b/tests/ten_runtime/integration/go/prepare_to_stop_go/BUILD.gn index aa0f16e317..f92b4aeec8 100644 --- a/tests/ten_runtime/integration/go/prepare_to_stop_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/prepare_to_stop_go/BUILD.gn @@ -15,7 +15,18 @@ ten_package_test_prepare_app("prepare_to_stop_go_app") { replace_paths_after_install_app = [ "prepare_to_stop_go_app/manifest.json", "prepare_to_stop_go_app/property.json", - "prepare_to_stop_go_app/ten_packages", + "prepare_to_stop_go_app/ten_packages/extension/extension_a/extension.go", + "prepare_to_stop_go_app/ten_packages/extension/extension_a/go.mod", + "prepare_to_stop_go_app/ten_packages/extension/extension_a/manifest.json", + "prepare_to_stop_go_app/ten_packages/extension/extension_a/property.json", + "prepare_to_stop_go_app/ten_packages/extension/extension_b/extension.go", + "prepare_to_stop_go_app/ten_packages/extension/extension_b/go.mod", + "prepare_to_stop_go_app/ten_packages/extension/extension_b/manifest.json", + "prepare_to_stop_go_app/ten_packages/extension/extension_b/property.json", + "prepare_to_stop_go_app/ten_packages/extension/extension_c/extension.go", + "prepare_to_stop_go_app/ten_packages/extension/extension_c/go.mod", + "prepare_to_stop_go_app/ten_packages/extension/extension_c/manifest.json", + "prepare_to_stop_go_app/ten_packages/extension/extension_c/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/return_result_go/BUILD.gn b/tests/ten_runtime/integration/go/return_result_go/BUILD.gn index f5014d6132..d4cfa62797 100644 --- a/tests/ten_runtime/integration/go/return_result_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/return_result_go/BUILD.gn @@ -15,7 +15,14 @@ ten_package_test_prepare_app("return_result_go_app") { replace_paths_after_install_app = [ "return_result_go_app/manifest.json", "return_result_go_app/property.json", - "return_result_go_app/ten_packages", + "return_result_go_app/ten_packages/extension/extension_a/extension.go", + "return_result_go_app/ten_packages/extension/extension_a/go.mod", + "return_result_go_app/ten_packages/extension/extension_a/manifest.json", + "return_result_go_app/ten_packages/extension/extension_a/property.json", + "return_result_go_app/ten_packages/extension/extension_b/extension.go", + "return_result_go_app/ten_packages/extension/extension_b/go.mod", + "return_result_go_app/ten_packages/extension/extension_b/manifest.json", + "return_result_go_app/ten_packages/extension/extension_b/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/return_value_go/BUILD.gn b/tests/ten_runtime/integration/go/return_value_go/BUILD.gn index fd179701c4..0e6ec0f04b 100644 --- a/tests/ten_runtime/integration/go/return_value_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/return_value_go/BUILD.gn @@ -15,8 +15,16 @@ ten_package_test_prepare_app("return_value_go_app") { replace_paths_after_install_app = [ "return_value_go_app/manifest.json", "return_value_go_app/property.json", - "return_value_go_app/ten_packages", - "return_value_go_app/go_common_dep", + "return_value_go_app/ten_packages/extension/extension_a/extension.go", + "return_value_go_app/ten_packages/extension/extension_a/go.mod", + "return_value_go_app/ten_packages/extension/extension_a/manifest.json", + "return_value_go_app/ten_packages/extension/extension_a/property.json", + "return_value_go_app/ten_packages/extension/extension_b/extension.go", + "return_value_go_app/ten_packages/extension/extension_b/go.mod", + "return_value_go_app/ten_packages/extension/extension_b/manifest.json", + "return_value_go_app/ten_packages/extension/extension_b/property.json", + "return_value_go_app/go_common_dep/types/data.go", + "return_value_go_app/go_common_dep/go.mod", "return_value_go_app/go.mod", ] diff --git a/tests/ten_runtime/integration/go/send_audio_frame_go/BUILD.gn b/tests/ten_runtime/integration/go/send_audio_frame_go/BUILD.gn index 6375b95d02..576e0d5fac 100644 --- a/tests/ten_runtime/integration/go/send_audio_frame_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/send_audio_frame_go/BUILD.gn @@ -15,7 +15,10 @@ ten_package_test_prepare_app("send_audio_frame_go_app") { replace_paths_after_install_app = [ "send_audio_frame_go_app/manifest.json", "send_audio_frame_go_app/property.json", - "send_audio_frame_go_app/ten_packages", + "send_audio_frame_go_app/ten_packages/extension/default_extension_go/extension.go", + "send_audio_frame_go_app/ten_packages/extension/default_extension_go/go.mod", + "send_audio_frame_go_app/ten_packages/extension/default_extension_go/manifest.json", + "send_audio_frame_go_app/ten_packages/extension/default_extension_go/property.json", ] deps = [ diff --git a/tests/ten_runtime/integration/go/send_data_go/BUILD.gn b/tests/ten_runtime/integration/go/send_data_go/BUILD.gn index 872d8df0a0..53122be49a 100644 --- a/tests/ten_runtime/integration/go/send_data_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/send_data_go/BUILD.gn @@ -15,7 +15,10 @@ ten_package_test_prepare_app("send_data_go_app") { replace_paths_after_install_app = [ "send_data_go_app/manifest.json", "send_data_go_app/property.json", - "send_data_go_app/ten_packages", + "send_data_go_app/ten_packages/extension/default_extension_go/extension.go", + "send_data_go_app/ten_packages/extension/default_extension_go/go.mod", + "send_data_go_app/ten_packages/extension/default_extension_go/manifest.json", + "send_data_go_app/ten_packages/extension/default_extension_go/property.json", ] deps = [ diff --git a/tests/ten_runtime/integration/go/send_video_frame_go/BUILD.gn b/tests/ten_runtime/integration/go/send_video_frame_go/BUILD.gn index d9438bae2a..fb33fb85dc 100644 --- a/tests/ten_runtime/integration/go/send_video_frame_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/send_video_frame_go/BUILD.gn @@ -15,7 +15,10 @@ ten_package_test_prepare_app("send_video_frame_go_app") { replace_paths_after_install_app = [ "send_video_frame_go_app/manifest.json", "send_video_frame_go_app/property.json", - "send_video_frame_go_app/ten_packages", + "send_video_frame_go_app/ten_packages/extension/default_extension_go/extension.go", + "send_video_frame_go_app/ten_packages/extension/default_extension_go/go.mod", + "send_video_frame_go_app/ten_packages/extension/default_extension_go/manifest.json", + "send_video_frame_go_app/ten_packages/extension/default_extension_go/property.json", ] deps = [ diff --git a/tests/ten_runtime/integration/go/three_extension_cmd_go/BUILD.gn b/tests/ten_runtime/integration/go/three_extension_cmd_go/BUILD.gn index 77161b22fd..416b969b77 100644 --- a/tests/ten_runtime/integration/go/three_extension_cmd_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/three_extension_cmd_go/BUILD.gn @@ -15,7 +15,18 @@ ten_package_test_prepare_app("three_extension_cmd_go_app") { replace_paths_after_install_app = [ "three_extension_cmd_go_app/manifest.json", "three_extension_cmd_go_app/property.json", - "three_extension_cmd_go_app/ten_packages", + "three_extension_cmd_go_app/ten_packages/extension/extension_a/extension.go", + "three_extension_cmd_go_app/ten_packages/extension/extension_a/go.mod", + "three_extension_cmd_go_app/ten_packages/extension/extension_a/manifest.json", + "three_extension_cmd_go_app/ten_packages/extension/extension_a/property.json", + "three_extension_cmd_go_app/ten_packages/extension/extension_b/extension.go", + "three_extension_cmd_go_app/ten_packages/extension/extension_b/go.mod", + "three_extension_cmd_go_app/ten_packages/extension/extension_b/manifest.json", + "three_extension_cmd_go_app/ten_packages/extension/extension_b/property.json", + "three_extension_cmd_go_app/ten_packages/extension/extension_c/extension.go", + "three_extension_cmd_go_app/ten_packages/extension/extension_c/go.mod", + "three_extension_cmd_go_app/ten_packages/extension/extension_c/manifest.json", + "three_extension_cmd_go_app/ten_packages/extension/extension_c/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/go/transfer_pointer_go/BUILD.gn b/tests/ten_runtime/integration/go/transfer_pointer_go/BUILD.gn index 5899ec28e1..763b2e4792 100644 --- a/tests/ten_runtime/integration/go/transfer_pointer_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/transfer_pointer_go/BUILD.gn @@ -15,8 +15,16 @@ ten_package_test_prepare_app("transfer_pointer_go_app") { replace_paths_after_install_app = [ "transfer_pointer_go_app/manifest.json", "transfer_pointer_go_app/property.json", - "transfer_pointer_go_app/ten_packages", - "transfer_pointer_go_app/go_common_dep", + "transfer_pointer_go_app/ten_packages/extension/extension_a/extension.go", + "transfer_pointer_go_app/ten_packages/extension/extension_a/go.mod", + "transfer_pointer_go_app/ten_packages/extension/extension_a/manifest.json", + "transfer_pointer_go_app/ten_packages/extension/extension_a/property.json", + "transfer_pointer_go_app/ten_packages/extension/extension_b/extension.go", + "transfer_pointer_go_app/ten_packages/extension/extension_b/go.mod", + "transfer_pointer_go_app/ten_packages/extension/extension_b/manifest.json", + "transfer_pointer_go_app/ten_packages/extension/extension_b/property.json", + "transfer_pointer_go_app/go_common_dep/types/data.go", + "transfer_pointer_go_app/go_common_dep/go.mod", "transfer_pointer_go_app/go.mod", ] diff --git a/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/BUILD.gn b/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/BUILD.gn index 2023159c70..cae8143ae6 100644 --- a/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/BUILD.gn +++ b/tests/ten_runtime/integration/go/two_extension_one_group_cmd_go/BUILD.gn @@ -15,7 +15,14 @@ ten_package_test_prepare_app("two_extension_one_group_cmd_go_app") { replace_paths_after_install_app = [ "two_extension_one_group_cmd_go_app/manifest.json", "two_extension_one_group_cmd_go_app/property.json", - "two_extension_one_group_cmd_go_app/ten_packages", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_a/extension.go", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_a/go.mod", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_a/manifest.json", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_a/property.json", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_b/extension.go", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_b/go.mod", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_b/manifest.json", + "two_extension_one_group_cmd_go_app/ten_packages/extension/addon_b/property.json", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/nodejs/mix_python_ext_nodejs/BUILD.gn b/tests/ten_runtime/integration/nodejs/mix_python_ext_nodejs/BUILD.gn index 5cf5b1c65a..15d0fea906 100644 --- a/tests/ten_runtime/integration/nodejs/mix_python_ext_nodejs/BUILD.gn +++ b/tests/ten_runtime/integration/nodejs/mix_python_ext_nodejs/BUILD.gn @@ -19,7 +19,7 @@ ten_package_test_prepare_app("mix_python_ext_nodejs_app") { replace_paths_after_install_all = [ "mix_python_ext_nodejs_app/ten_packages/extension/default_extension_nodejs/src/index.ts", - "mix_python_ext_nodejs_app/bin", + "mix_python_ext_nodejs_app/bin/bootstrap", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/python/cpp_app_multi_process_python/BUILD.gn b/tests/ten_runtime/integration/python/cpp_app_multi_process_python/BUILD.gn index e8e4bbcaea..56c26b930c 100644 --- a/tests/ten_runtime/integration/python/cpp_app_multi_process_python/BUILD.gn +++ b/tests/ten_runtime/integration/python/cpp_app_multi_process_python/BUILD.gn @@ -20,7 +20,8 @@ ten_package_test_prepare_app("cpp_app_multi_process_python_app") { replace_paths_after_install_all = [ "cpp_app_multi_process_python_app/ten_packages/extension/default_extension_python/extension.py", "cpp_app_multi_process_python_app/BUILD.gn", - "cpp_app_multi_process_python_app/bin", + "cpp_app_multi_process_python_app/bin/bootstrap", + "cpp_app_multi_process_python_app/bin/start", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/python/cpp_app_python/BUILD.gn b/tests/ten_runtime/integration/python/cpp_app_python/BUILD.gn index 61dbf1d782..076769732c 100644 --- a/tests/ten_runtime/integration/python/cpp_app_python/BUILD.gn +++ b/tests/ten_runtime/integration/python/cpp_app_python/BUILD.gn @@ -20,7 +20,8 @@ ten_package_test_prepare_app("cpp_app_python_app") { replace_paths_after_install_all = [ "cpp_app_python_app/ten_packages/extension/default_extension_python/extension.py", "cpp_app_python_app/BUILD.gn", - "cpp_app_python_app/bin", + "cpp_app_python_app/bin/bootstrap", + "cpp_app_python_app/bin/start", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/python/go_app_async_extension_python/BUILD.gn b/tests/ten_runtime/integration/python/go_app_async_extension_python/BUILD.gn index 95a8612164..56532fa1da 100644 --- a/tests/ten_runtime/integration/python/go_app_async_extension_python/BUILD.gn +++ b/tests/ten_runtime/integration/python/go_app_async_extension_python/BUILD.gn @@ -19,7 +19,7 @@ ten_package_test_prepare_app("go_app_async_extension_python_app") { replace_paths_after_install_all = [ "go_app_async_extension_python_app/ten_packages/extension/default_extension_python/extension.py", - "go_app_async_extension_python_app/bin", + "go_app_async_extension_python_app/bin/bootstrap", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/python/go_app_cythonize/BUILD.gn b/tests/ten_runtime/integration/python/go_app_cythonize/BUILD.gn index 454f8399e6..68ce642c23 100644 --- a/tests/ten_runtime/integration/python/go_app_cythonize/BUILD.gn +++ b/tests/ten_runtime/integration/python/go_app_cythonize/BUILD.gn @@ -15,10 +15,15 @@ ten_package_test_prepare_app("go_app_cythonize_app") { replace_paths_after_install_app = [ "go_app_cythonize_app/manifest.json", "go_app_cythonize_app/property.json", - "go_app_cythonize_app/ten_packages/extension/default_extension_python", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/__init__.pyx", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/addon.pyx", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/extension.pyx", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/log.pyx", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/manifest.json", + "go_app_cythonize_app/ten_packages/extension/default_extension_python/property.json", ] - replace_paths_after_install_all = [ "go_app_cythonize_app/bin" ] + replace_paths_after_install_all = [ "go_app_cythonize_app/bin/bootstrap" ] if (ten_enable_ten_manager) { deps = [ diff --git a/tests/ten_runtime/integration/python/go_app_partially_cythonize/BUILD.gn b/tests/ten_runtime/integration/python/go_app_partially_cythonize/BUILD.gn index 6f8ccbbf3b..eeab34a181 100644 --- a/tests/ten_runtime/integration/python/go_app_partially_cythonize/BUILD.gn +++ b/tests/ten_runtime/integration/python/go_app_partially_cythonize/BUILD.gn @@ -15,10 +15,16 @@ ten_package_test_prepare_app("go_app_partially_cythonize_app") { replace_paths_after_install_app = [ "go_app_partially_cythonize_app/manifest.json", "go_app_partially_cythonize_app/property.json", - "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/__init__.py", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/addon.py", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/extension.pyx", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/log.py", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/manifest.json", + "go_app_partially_cythonize_app/ten_packages/extension/default_extension_python/property.json", ] - replace_paths_after_install_all = [ "go_app_partially_cythonize_app/bin" ] + replace_paths_after_install_all = + [ "go_app_partially_cythonize_app/bin/bootstrap" ] if (ten_enable_ten_manager) { deps = [ diff --git a/tests/ten_runtime/integration/python/go_app_python/BUILD.gn b/tests/ten_runtime/integration/python/go_app_python/BUILD.gn index 0840a336c1..7bb572281d 100644 --- a/tests/ten_runtime/integration/python/go_app_python/BUILD.gn +++ b/tests/ten_runtime/integration/python/go_app_python/BUILD.gn @@ -19,7 +19,7 @@ ten_package_test_prepare_app("go_app_python_app") { replace_paths_after_install_all = [ "go_app_python_app/ten_packages/extension/default_extension_python/extension.py", - "go_app_python_app/bin", + "go_app_python_app/bin/bootstrap", ] if (ten_enable_ten_manager) { diff --git a/tests/ten_runtime/integration/python/send_cmd_python/BUILD.gn b/tests/ten_runtime/integration/python/send_cmd_python/BUILD.gn index d4c8c0eac4..c1e9f5b10c 100644 --- a/tests/ten_runtime/integration/python/send_cmd_python/BUILD.gn +++ b/tests/ten_runtime/integration/python/send_cmd_python/BUILD.gn @@ -25,7 +25,7 @@ ten_package_test_prepare_app("send_cmd_python_app") { # loader (`dlopen`) fails to load. Ensure that this does not block other # installed addon loaders (such as the Python addon loader) from continuing # to load the addon. - "send_cmd_python_app/ten_packages/extension/default_extension_python/lib", + "send_cmd_python_app/ten_packages/extension/default_extension_python/lib/.gitkeep", ] if (ten_enable_ten_manager) {