Resolve the bug of the autoenabled modules

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 17794579e0ca8ab6e950c4d03ba4cf8bd6aa742f..d8c5f515ad1069407ddb6fd352d61c5173a00037 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -19,7 +19,7 @@ import copytree
 import pickle
 
 import const
-from plugins import codelite_project
+import plugins
 import DefineException
 
 def isBertosDir(directory):
@@ -70,7 +70,7 @@ def createBertosProject(project_info):
             configurations = project_info.info("CONFIGURATIONS")
             configuration = configurations[information["configuration"]]
             for start, parameter in configuration["paramlist"]:
-                if "type" in configuration[parameter] and configuration[parameter]["type"] == "autoenabled":
+                if "type" in configuration[parameter]["informations"] and configuration[parameter]["informations"]["type"] == "autoenabled":
                     configuration[parameter]["value"] = "1"
             project_info.setInfo("CONFIGURATIONS", configurations)
     # Copy all the configuration files
@@ -94,10 +94,19 @@ def createBertosProject(project_info):
     # Destination main.c file
     main = open("srctemplates/main.c", "r").read()
     open(prjdir + "/main.c", "w").write(main)
-    # Codelite project files
-    if "codelite" in project_info.info("OUTPUT"):
-        codelite_project.createProject(project_info)
-
+    # Files for selected plugins
+    relevants_files = {}
+    for plugin in project_info.info("OUTPUT"):
+        module = loadPlugin(plugin)
+        relevants_files[plugin] = module.createProject(project_info)
+    project_info.setInfo("RELEVANT_FILES", relevants_files)
+
+def loadPlugin(plugin):
+    """
+    Returns the given plugin module.
+    """
+    return getattr(__import__("plugins", {}, {}, [plugin]), plugin)
+    
 def mkGenerator(project_info, makefile):
     """
     Generates the mk file for the current project.
@@ -115,8 +124,8 @@ def mkGenerator(project_info, makefile):
     mk_data["$asflags"] = " ".join(project_info.info("CPU_INFOS")["AS_FLAGS"])
     mk_data["$arflags"] = " ".join(project_info.info("CPU_INFOS")["AR_FLAGS"])
     mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info)
-    mk_data["$prefix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[0]
-    mk_data["$suffix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[1]
+    mk_data["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[0])
+    mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[1])
     mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c"
     for key in mk_data:
         while makefile.find(key) != -1:
@@ -206,8 +215,7 @@ def findModuleFiles(module, project_info):
     for filename, path in findDefinitions(module + ".c", project_info) + \
             findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c", project_info):
         path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "")
-        if os.sep != "/":
-            path = replaceSeparators(path)
+        path = replaceSeparators(path)
         cfiles.append(path + "/" + filename)
     # .s files related to the module and the cpu architecture
     for filename, path in findDefinitions(module + ".s", project_info) + \
@@ -215,8 +223,7 @@ def findModuleFiles(module, project_info):
             findDefinitions(module + ".S", project_info) + \
             findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S", project_info):
         path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "")
-        if os.sep != "/":
-            path = replaceSeparators(path)
+        path = replaceSeparators(path)
         sfiles.append(path + "/" + filename)
     # .c and .s files related to the module and the cpu tags
     for tag in project_info.info("CPU_INFOS")["CPU_TAGS"]:
@@ -228,8 +235,7 @@ def findModuleFiles(module, project_info):
         for filename, path in findDefinitions(module + "_" + tag + ".s", project_info) + \
                 findDefinitions(module + "_" + tag + ".S", project_info):
             path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "")
-            if os.sep != "/":
-                path = replaceSeparators(path)
+            path = replaceSeparators(path)
             sfiles.append(path + "/" + filename)
     return cfiles, sfiles
 
@@ -237,8 +243,9 @@ def replaceSeparators(path):
     """
     Replace the separators in the given path with unix standard separator.
     """
-    while path.find(os.sep) != -1:
-        path = path.replace(os.sep, "/")
+    if os.sep != "/":
+        while path.find(os.sep) != -1:
+            path = path.replace(os.sep, "/")
     return path
 
 def getSystemPath():
@@ -384,7 +391,7 @@ def loadModuleDefinition(first_comment):
     return to_be_parsed, module_dict
 
 def isSupported(project, module=None, property_id=None):
-    if module is None and property_id is not None:
+    if not module and property_id:
         item = project.info("CONFIGURATIONS")[property_id[0]][property_id[1]]["informations"]
     else:
         item = project.info("MODULES")[module]