diff options
Diffstat (limited to 'tools/building.py')
| -rw-r--r-- | tools/building.py | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/tools/building.py b/tools/building.py index d6c56ad3ba..797ffc0076 100644 --- a/tools/building.py +++ b/tools/building.py @@ -139,10 +139,20 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ # set RTT_ROOT in ENV Env['RTT_ROOT'] = Rtt_Root + os.environ["RTT_DIR"] = Rtt_Root # set BSP_ROOT in ENV Env['BSP_ROOT'] = Dir('#').abspath + os.environ["BSP_DIR"] = Dir('#').abspath + # set PKGS_ROOT in ENV + if not "PKGS_DIR" in os.environ: + if "ENV_ROOT" in os.environ: + os.environ["PKGS_DIR"] = os.path.join(os.environ["ENV_ROOT"], "packages") + elif sys.platform == "win32": + os.environ["PKGS_DIR"] = os.path.join(os.environ["USERPROFILE"], ".env/packages") + else: + os.environ["PKGS_DIR"] = os.path.join(os.environ["HOME"], ".env/packages") - sys.path = sys.path + [os.path.join(Rtt_Root, 'tools')] + sys.path = sys.path + [os.path.join(Rtt_Root, 'tools'), os.path.join(Rtt_Root, 'tools/kconfiglib')] # {target_name:(CROSS_TOOL, PLATFORM)} tgt_dict = {'mdk':('keil', 'armcc'), @@ -303,7 +313,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ print('--global-macros arguments are illegal!') if GetOption('genconfig'): - from genconf import genconfig + from menukconfig import genconfig genconfig() exit(0) @@ -311,25 +321,25 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ from WCS import ThreadStackStaticAnalysis ThreadStackStaticAnalysis(Env) exit(0) - if platform.system() != 'Windows': - if GetOption('menuconfig'): - from menuconfig import menuconfig - menuconfig(Rtt_Root) - exit(0) + + if GetOption('menuconfig'): + from menukconfig import menuconfig + menuconfig(Rtt_Root) + exit(0) if GetOption('pyconfig-silent'): - from menuconfig import guiconfig_silent + from menukconfig import guiconfig_silent guiconfig_silent(Rtt_Root) exit(0) elif GetOption('pyconfig'): - from menuconfig import guiconfig + from menukconfig import guiconfig guiconfig(Rtt_Root) exit(0) configfn = GetOption('useconfig') if configfn: - from menuconfig import mk_rtconfig + from menukconfig import mk_rtconfig mk_rtconfig(configfn) exit(0) |