X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=619371ad663ca60c6e8097c735f79c232ec3cf0f;hb=3d3ba83839f2a8faed6c373e5153d61672ce7fb6;hp=3c0fba640fd537e52b11a3dda73be7ff277cd5e2;hpb=b097f95a87e2b5c00e2b6db32806c21a2db9b992;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 3c0fba64..619371ad 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -182,7 +181,8 @@ def mkGenerator(project_info): Generates the mk file for the current project. """ makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read() - destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + ".mk") + prjdir = os.path.abspath(project_info.prjdir) + destination = os.path.join(prjdir, os.path.basename(prjdir) + ".mk") mk_data = {} mk_data["$pname"] = project_info.info("PROJECT_NAME") mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")) @@ -348,7 +348,8 @@ def findToolchains(path_list): toolchains = [] for element in path_list: for toolchain in glob.glob(element+ "/" + const.GCC_NAME): - toolchains.append(toolchain) + if not os.path.isdir(toolchain): + toolchains.append(toolchain) return list(set(toolchains)) def getToolchainInfo(output):