From b4ccee682a5e1e8c7c532da2928a4ce2522d9626 Mon Sep 17 00:00:00 2001 From: tfx2001 Date: Sat, 9 Dec 2023 22:27:27 +0800 Subject: [PATCH] fix .config file not working on Unix systems --- cmds/cmd_package/cmd_package_update.py | 2 +- cmds/cmd_package/cmd_package_utils.py | 4 ++-- statistics.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmds/cmd_package/cmd_package_update.py b/cmds/cmd_package/cmd_package_update.py index 95824209..4fd9c773 100644 --- a/cmds/cmd_package/cmd_package_update.py +++ b/cmds/cmd_package/cmd_package_update.py @@ -158,7 +158,7 @@ def need_using_mirror_download(): return is_China_ip server_decision = "" - config_file = os.path.join(Import('env_root'), r'tools\scripts\cmds', '.config') + config_file = os.path.join(Import('env_root'), 'tools', 'scripts', 'cmds', '.config') if os.path.isfile(config_file) and find_bool_macro_in_config(config_file, 'SYS_DOWNLOAD_SERVER_GITHUB'): is_China_ip = False # Github which means not China IP server_decision = "manually decision" diff --git a/cmds/cmd_package/cmd_package_utils.py b/cmds/cmd_package/cmd_package_utils.py index a26e052c..2f776f33 100644 --- a/cmds/cmd_package/cmd_package_utils.py +++ b/cmds/cmd_package/cmd_package_utils.py @@ -222,7 +222,7 @@ def find_string_macro_in_config(filename, macro_name): def find_IAR_EXEC_PATH(): env_root = Import('env_root') # get the .config file from env - env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds') + env_kconfig_path = os.path.join(env_root, 'tools', 'scripts', 'cmds') env_config_file = os.path.join(env_kconfig_path, '.config') return find_string_macro_in_config(env_config_file, 'SYS_CREATE_IAR_EXEC_PATH') @@ -232,7 +232,7 @@ def find_IAR_EXEC_PATH(): def find_MDK_EXEC_PATH(): env_root = Import('env_root') # get the .config file from env - env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds') + env_kconfig_path = os.path.join(env_root, 'tools', 'scripts', 'cmds') env_config_file = os.path.join(env_kconfig_path, '.config') return find_string_macro_in_config(env_config_file, 'SYS_CREATE_MDK_EXEC_PATH') diff --git a/statistics.py b/statistics.py index b274855a..701870dd 100644 --- a/statistics.py +++ b/statistics.py @@ -39,7 +39,7 @@ def get_mac_address(): def Information_statistics(): # get the .config file from env - env_kconfig_path = os.path.join(os.getcwd(), 'tools\\scripts\\cmdscmds') + env_kconfig_path = os.path.join(os.getcwd(), 'tools', 'scripts', 'cmds') env_config_file = os.path.join(env_kconfig_path, '.config') mac_addr = get_mac_address()