From 9f8bad4bef5b72c32e75f7e80bfffa221866b5f5 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Thu, 30 Jun 2022 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E9=9A=8F?= =?UTF-8?q?=E6=9C=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- scripts/param_cfg_to_code.py | 28 ++++++++-------- services/param/liteos/BUILD.gn | 60 +++++++++------------------------- test/unittest/lite/BUILD.gn | 4 +-- 3 files changed, 29 insertions(+), 63 deletions(-) diff --git a/scripts/param_cfg_to_code.py b/scripts/param_cfg_to_code.py index c34c86d2..71406901 100755 --- a/scripts/param_cfg_to_code.py +++ b/scripts/param_cfg_to_code.py @@ -130,36 +130,34 @@ def main(): description='A common change param.para file to h.') parser.add_argument( '--source', + action='append', help='The source to change.', required=True) parser.add_argument( '--dest_dir', help='Path that the source should be changed to.', required=True) - parser.add_argument( - '--priority', - help='If priority is 1, replace the parameter if it exist.', - required=True) args = parser.parse_args() out_dir = args.dest_dir if not os.path.exists(out_dir): os.makedirs(out_dir, exist_ok=True) - print(out_dir) + print("out_dir " + out_dir) - source = args.source - assert os.path.exists(source) + for source in args.source: + print("source " + source) + assert os.path.exists(source) - srcDict = GetParamFromCfg(source) - dst = out_dir + "param_cfg.h" + srcDict = GetParamFromCfg(source) + dst = out_dir + "param_cfg.h" - if os.path.exists(dst): - dstDict = GetParamFromCCode(dst) - else: - dstDict = {} + if os.path.exists(dst): + dstDict = GetParamFromCCode(dst) + else: + dstDict = {} - dstDict = AddToCodeDict(dstDict, srcDict, args.priority == "1") - WriteMapToCode(dst, dstDict) + dstDict = AddToCodeDict(dstDict, srcDict, False) + WriteMapToCode(dst, dstDict) return 0 diff --git a/services/param/liteos/BUILD.gn b/services/param/liteos/BUILD.gn index 2bc1447e..37b66f54 100644 --- a/services/param/liteos/BUILD.gn +++ b/services/param/liteos/BUILD.gn @@ -35,46 +35,20 @@ param_build_defines = [ "BUILD_ROOTHASH=\"${ohos_build_roothash}\"", ] -if (enable_ohos_startup_init_feature_begetctl_liteos) { - action("lite_const_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path( - "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "0", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } - - action("lite_ohos_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "0", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } - - action("vendor_param_to") { - script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" - args = [ - "--source", - rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), - "--dest_dir", - rebase_path("$root_out_dir/gen/init_lite/"), - "--priority", - "1", - ] - outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] - } +action("lite_ohos_param_to") { + script = "//base/startup/init_lite/scripts/param_cfg_to_code.py" + args = [ + "--source", + rebase_path( + "//base/startup/init_lite/services/etc_lite/param/ohos_const/ohos.para"), + "--source", + rebase_path("$ohos_product_adapter_dir/utils/sys_param/vendor.para"), + "--source", + rebase_path("//base/startup/init_lite/services/etc/param/ohos.para"), + "--dest_dir", + rebase_path("$root_out_dir/gen/init_lite/"), + ] + outputs = [ "$target_gen_dir/${target_name}_param_cfg_to_code.log" ] } config("exported_header_files") { @@ -162,11 +136,7 @@ static_library("param_client_lite") { "DATA_PATH=\"${config_ohos_startup_init_lite_data_path}\"", ] if (enable_ohos_startup_init_feature_begetctl_liteos) { - deps = [ - ":lite_const_param_to", - ":lite_ohos_param_to", - ":vendor_param_to", - ] + deps = [ ":lite_ohos_param_to" ] include_dirs += [ "$root_out_dir/gen/init_lite" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] } diff --git a/test/unittest/lite/BUILD.gn b/test/unittest/lite/BUILD.gn index f102af87..62ca94fd 100755 --- a/test/unittest/lite/BUILD.gn +++ b/test/unittest/lite/BUILD.gn @@ -139,7 +139,6 @@ if (defined(ohos_lite)) { if (enable_ohos_startup_init_feature_begetctl_liteos) { deps += [ "$ohos_product_adapter_dir/utils/sys_param:hal_sysparam", - "//base/startup/init_lite/services/param/liteos:lite_const_param_to", "//base/startup/init_lite/services/param/liteos:lite_ohos_param_to", ] include_dirs += [ "$root_out_dir/gen/init_lite" ] @@ -180,8 +179,7 @@ if (defined(ohos_lite)) { # add cfg.h if (enable_ohos_startup_init_feature_begetctl_liteos) { deps += [ - "//base/startup/init_lite/services/param:lite_const_param_to", - "//base/startup/init_lite/services/param:lite_ohos_param_to", + "//base/startup/init_lite/services/param/liteos:lite_ohos_param_to", ] include_dirs += [ "$root_out_dir/gen/init_lite" ] defines += [ "PARAM_LOAD_CFG_FROM_CODE" ] -- GitLab