From b12284e6dcb012cad2ac0cb01555806ae848b19e Mon Sep 17 00:00:00 2001 From: bernard Date: Wed, 28 Aug 2024 22:43:46 +0800 Subject: [PATCH 1/2] [tools] fix the SDK path issue in env script. --- tools/env_utility.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/env_utility.py b/tools/env_utility.py index dc6425464ac..608ef4fa156 100644 --- a/tools/env_utility.py +++ b/tools/env_utility.py @@ -41,13 +41,22 @@ def GetPkgPath(): else: return None - -def GetSDKPath(name): +def GetSDKPackagePath(): env = GetEnvPath() if env: - # read packages.json under env/tools/packages - with open(os.path.join(env, 'tools', 'packages', 'pkgs.json'), 'r', encoding='utf-8') as f: + return os.path.join(env, "tools", "scripts", "packages") + + return None + +# get SDK path based on name +# for example, GetSDKPath('arm-none-eabi') = '.env/tools/scripts/packages/arm-none-eabi-gcc-v10.3' +def GetSDKPath(name): + sdk_pkgs = GetSDKPackagePath() + + if sdk_pkgs: + # read packages.json under env/tools/scripts/packages + with open(os.path.join(sdk_pkgs, 'pkgs.json'), 'r', encoding='utf-8') as f: # packages_json = f.read() packages = json.load(f) @@ -59,12 +68,11 @@ def GetSDKPath(name): package = json.load(f) if package['name'] == name: - return os.path.join(env, 'tools', 'packages', package['name'] + '-' + item['ver']) + return os.path.join(sdk_pkgs, package['name'] + '-' + item['ver']) # not found named package return None - def help_info(): print( "**********************************************************************************\n" From 92392047216d637fa6b97648e3315c557a1c89a9 Mon Sep 17 00:00:00 2001 From: bernard Date: Mon, 12 May 2025 23:10:01 +0800 Subject: [PATCH 2/2] [building] rename the group name: LIBADT to Utilities. --- components/drivers/smp_call/SConscript | 2 +- components/utilities/libadt/avl/SConscript | 2 +- components/utilities/libadt/bitmap/SConscript | 2 +- components/utilities/libadt/hashmap/SConscript | 2 +- components/utilities/libadt/ref/SConscript | 2 +- components/utilities/libadt/uthash/SConscript | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/drivers/smp_call/SConscript b/components/drivers/smp_call/SConscript index 2f4fe0b8ec4..1499c667e1d 100644 --- a/components/drivers/smp_call/SConscript +++ b/components/drivers/smp_call/SConscript @@ -5,6 +5,6 @@ src = [] if GetDepend("RT_USING_SMP"): src += Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('smp', src, depend = [''], CPPPATH = CPPPATH) +group = DefineGroup('DeviceDrivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/libadt/avl/SConscript b/components/utilities/libadt/avl/SConscript index 8fabef3de38..cc4b1bf0fa3 100755 --- a/components/utilities/libadt/avl/SConscript +++ b/components/utilities/libadt/avl/SConscript @@ -5,5 +5,5 @@ src = Glob('*.c') CPPPATH = [cwd] group = [] -group = DefineGroup('LIBADT', src, depend = ['RT_USING_ADT_AVL'], CPPPATH = CPPPATH) +group = DefineGroup('Utilities', src, depend = ['RT_USING_ADT_AVL'], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/libadt/bitmap/SConscript b/components/utilities/libadt/bitmap/SConscript index 739ff3b0906..bf93e3f5853 100755 --- a/components/utilities/libadt/bitmap/SConscript +++ b/components/utilities/libadt/bitmap/SConscript @@ -5,5 +5,5 @@ src = list() CPPPATH = [cwd] group = [] -group = DefineGroup('LIBADT', src, depend = ['RT_USING_ADT_BITMAP'], CPPPATH = CPPPATH) +group = DefineGroup('Utilities', src, depend = ['RT_USING_ADT_BITMAP'], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/libadt/hashmap/SConscript b/components/utilities/libadt/hashmap/SConscript index 21e47649452..dac7aba4042 100755 --- a/components/utilities/libadt/hashmap/SConscript +++ b/components/utilities/libadt/hashmap/SConscript @@ -5,5 +5,5 @@ src = list() CPPPATH = [cwd] group = [] -group = DefineGroup('LIBADT', src, depend = ['RT_USING_ADT_HASHMAP'], CPPPATH = CPPPATH) +group = DefineGroup('Utilities', src, depend = ['RT_USING_ADT_HASHMAP'], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/libadt/ref/SConscript b/components/utilities/libadt/ref/SConscript index faec4622072..0803457b427 100755 --- a/components/utilities/libadt/ref/SConscript +++ b/components/utilities/libadt/ref/SConscript @@ -5,5 +5,5 @@ src = list() CPPPATH = [cwd] group = [] -group = DefineGroup('LIBADT', src, depend = ['RT_USING_ADT_REF'], CPPPATH = CPPPATH) +group = DefineGroup('Utilities', src, depend = ['RT_USING_ADT_REF'], CPPPATH = CPPPATH) Return('group') diff --git a/components/utilities/libadt/uthash/SConscript b/components/utilities/libadt/uthash/SConscript index adb871b4720..75a037481b8 100644 --- a/components/utilities/libadt/uthash/SConscript +++ b/components/utilities/libadt/uthash/SConscript @@ -5,5 +5,5 @@ src = Glob('*.c') CPPPATH = [cwd] group = [] -group = DefineGroup('LIBADT', src, depend = [], CPPPATH = CPPPATH) +group = DefineGroup('Utilities', src, depend = [], CPPPATH = CPPPATH) Return('group')