Skip to content

Fix .config file not working on Unix systems #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 1 commit into from
Dec 9, 2023
Merged

Fix .config file not working on Unix systems #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmds/cmd_package/cmd_package_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmds/cmd_package/cmd_package_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion statistics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down