X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=204c4fe4ea1e602f9f61ecbaf5756451dee36b88;hb=e99bfa0c0bca2c622e812506f4adfabd99f7b90c;hp=8a3c771208ea3d99fd9d75864e6bccc2d11da713;hpb=68e4e9905f22d675da72650b8d13c9d69c5b264f;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 8a3c7712..204c4fe4 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -134,7 +134,7 @@ def projectFileGenerator(project_info): project_src_relpath = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), directory) project_data["PROJECT_SRC_PATH"] = project_src_relpath project_data["PROJECT_SRC_PATH_FROM_MAKEFILE"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE") - project_data["TOOLCHAIN"] = project_info.info("TOOLCHAIN") + project_data["TOOLCHAIN"] = {'path': project_info.info("TOOLCHAIN")['path']} project_data["CPU_NAME"] = project_info.info("CPU_NAME") project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ") project_data["OUTPUT"] = project_info.info("OUTPUT") @@ -340,12 +340,17 @@ def replaceSeparators(path): def getSystemPath(): path = os.environ["PATH"] - if os.name == "nt": - path = path.split(";") - else: - path = path.split(":") + path = path.split(os.pathsep) return path +def findInPath(file, path=None): + if path is None: + path = os.environ.get('PATH', '') + if type(path) is type(''): + path = path.split(os.pathsep) + return filter(os.path.exists, map(lambda dir, file=file: os.path.join(dir, file), path)) + + def findToolchains(path_list): toolchains = [] for element in path_list: