X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=1066f034e4c7f9a66aebdc9c709d410877f85697;hb=861b72bbf12340a6d838923e09db145d28538697;hp=cfaf2a7fd631f4f0a18f3c0f4f5d662c4845fac9;hpb=d685c5f413bd6cbd5f00c35da830a9a93ff943f1;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index cfaf2a7f..1066f034 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -78,6 +78,8 @@ def mkGenerator(projectInfo, makefile):
     mkData["$cflags"] = " ".join(projectInfo.info("CPU_INFOS")["C_FLAGS"])
     mkData["$ldflags"] = " ".join(projectInfo.info("CPU_INFOS")["LD_FLAGS"])
     mkData["$csrc"] = csrcGenerator(projectInfo)
+    mkData["$prefix"] = os.path.basename(projectInfo.info("TOOLCHAIN")["path"]).split("gcc")[0]
+    mkData["$suffix"] = os.path.basename(projectInfo.info("TOOLCHAIN")["path"]).split("gcc")[1]
     for key in mkData:
         while makefile.find(key) != -1:
             makefile = makefile.replace(key, mkData[key])
@@ -104,7 +106,7 @@ def csrcGenerator(projectInfo):
             for tag in projectInfo.info("CPU_INFOS")["CPU_TAGS"]:
                 for filename, path in findDefinitions(module + "_" + tag + ".c", projectInfo):
                     files.append(path + "/" + filename)
-    csrc = " \\\n\t".join(files)
+    csrc = " \\\n\t".join(files) + " \\"
     return csrc
     
 def getSystemPath():
@@ -119,8 +121,7 @@ def findToolchains(pathList):
     toolchains = []
     for element in pathList:
         for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
-            if not os.path.islink(toolchain):
-                toolchains.append(toolchain)
+            toolchains.append(toolchain)
     return list(set(toolchains))
 
 def getToolchainInfo(output):
@@ -287,6 +288,7 @@ def loadModuleData(project):
             except ParseError, err:
                 raise DefineException.ModuleDefineException(path, err.line_number, err.line)
             for module, information in moduleDict.items():
+                information["category"] = os.path.basename(path)
                 if "configuration" in information.keys() and len(information["configuration"]):
                     configuration = moduleDict[module]["configuration"]
                     try: