X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=925774ba387fefe0761b66364763fb40c9a8bc9d;hb=822c03fa0b9d667b6abf4b04d89b7debd8bc5afb;hp=9cd3211593f21c4d72d41459811ed83f91ca3261;hpb=fcce2ef97ab57af24edc4440aa557b9d7e747b69;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 9cd32115..925774ba 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -16,6 +16,7 @@ import re
 import shutil
 
 import const
+import DefineException
 
 def isBertosDir(directory):
    return os.path.exists(directory + "/VERSION")
@@ -54,6 +55,8 @@ def createBertosProject(projectInfos):
         string = open(sourcesDir + "/" + key, "r").read()
         for parameter, infos in value.items():
             value = infos["value"]
+            if "unsigned" in infos["informations"].keys() and infos["informations"]["unsigned"]:
+                value += "U"
             if "long" in infos["informations"].keys() and infos["informations"]["long"]:
                 value += "L"
             string = sub(string, parameter, value)
@@ -63,7 +66,7 @@ def createBertosProject(projectInfos):
     ## Destinatio mk file
     makefile = open("mktemplates/template.mk", "r").read()
     makefile = mkGenerator(projectInfos, makefile)
-    open(prjdir + "/" + "project.mk", "w").write(makefile)
+    open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile)
 
 def mkGenerator(projectInfos, makefile):
     """
@@ -201,15 +204,28 @@ def loadConfigurationInfos(path):
             "long": boolean indicating if the num is a long
             "value_list": the name of the enum for enum parameters
     """
-    configurationInfos = {}
-    for comment, define in getDefinitionBlocks(open(path, "r").read()):
-        name, value = formatParamNameValue(define)
-        description, informations = getDescriptionInformations(comment)
-        configurationInfos[name] = {}
-        configurationInfos[name]["value"] = value
-        configurationInfos[name]["informations"] = informations
-        configurationInfos[name]["description"] = description
-    return configurationInfos
+    try:
+        configurationInfos = {}
+        for comment, define in getDefinitionBlocks(open(path, "r").read()):
+            name, value = formatParamNameValue(define)
+            description, informations = getDescriptionInformations(comment)
+            configurationInfos[name] = {}
+            configurationInfos[name]["value"] = value
+            configurationInfos[name]["informations"] = informations
+            if ("type" in configurationInfos[name]["informations"].keys() and
+                    configurationInfos[name]["informations"]["type"] == "int" and
+                    configurationInfos[name]["value"].find("L") != -1):
+                configurationInfos[name]["informations"]["long"] = True
+                configurationInfos[name]["value"] = configurationInfos[name]["value"].replace("L", "")
+            if ("type" in configurationInfos[name]["informations"].keys() and
+                    configurationInfos[name]["informations"]["type"] == "int" and
+                    configurationInfos[name]["value"].find("U") != -1):
+                configurationInfos[name]["informations"]["unsigned"] = True
+                configurationInfos[name]["value"] = configurationInfos[name]["value"].replace("U", "")
+            configurationInfos[name]["description"] = description
+        return configurationInfos
+    except SyntaxError:
+        raise DefineException.ConfigurationDefineException(path)
 
 def loadModuleInfos(path):
     """
@@ -222,20 +238,28 @@ def loadModuleInfos(path):
         "enabled": contains False but the wizard will change if the user select
         the module
     """
-    moduleInfos = {}
-    string = open(path, "r").read()
-    commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string)
-    commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList]
-    for comment in commentList:
-        index = comment.find("$WIZARD_MODULE")
-        if index != -1:
-            exec(comment[index + 1:])
-            moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"],
-                                                    "configuration": WIZARD_MODULE["configuration"],
-                                                    "description": "",
-                                                    "enabled": False}
-            return moduleInfos
-    return {}
+    try:
+        moduleInfos = {}
+        string = open(path, "r").read()
+        commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string)
+        commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList]
+        for comment in commentList:
+            index = comment.find("$WIZARD_MODULE")
+            if index != -1:
+                exec(comment[index + 1:])
+                moduleInfos[WIZARD_MODULE["name"]] = {"depends": WIZARD_MODULE["depends"],
+                                                        "configuration": WIZARD_MODULE["configuration"],
+                                                        "description": "",
+                                                        "enabled": False}
+                index = comment.find("\\brief")
+                if index != -1:
+                    description = comment[index + 7:]
+                    description = description[:description.find(" * ")]
+                    moduleInfos[WIZARD_MODULE["name"]]["description"] = description
+                return moduleInfos
+        return {}
+    except SyntaxError:
+        raise DefineException.ModuleDefineException(path)
 
 def loadModuleInfosDict(path):
     """
@@ -250,16 +274,19 @@ def loadDefineLists(path):
     """
     Return a dict with the name of the list as key and a list of string as value
     """
-    string = open(path, "r").read()
-    commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string)
-    commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList]
-    listDict = {}
-    for comment in commentList:
-        index = comment.find("$WIZARD_LIST")
-        if index != -1:
-            exec(comment[index + 1:])
-            listDict.update(WIZARD_LIST)
-    return listDict
+    try:
+        string = open(path, "r").read()
+        commentList = re.findall(r"/\*{2}\s*([^*]*\*(?:[^/*][^*]*\*+)*)/", string)
+        commentList = [" ".join(re.findall(r"^\s*\*?\s*(.*?)\s*?(?:/{2}.*?)?$", comment, re.MULTILINE)).strip() for comment in commentList]
+        listDict = {}
+        for comment in commentList:
+            index = comment.find("$WIZARD_LIST")
+            if index != -1:
+                exec(comment[index + 1:])
+                listDict.update(WIZARD_LIST)
+        return listDict
+    except SyntaxError:
+        raise DefineException.EnumDefineException(path)
 
 def loadDefineListsDict(path):
     """
@@ -275,3 +302,39 @@ def sub(string, parameter, value):
     Substitute the given value at the given parameter define in the given string
     """
     return re.sub(r"(?P<define>#define\s+" + parameter + r"\s+)([^\s]+)", r"\g<define>" + value, string)
+
+def isInt(informations):
+    """
+    Return True if the value is a simple int.
+    """
+    if ("long" not in informatios.keys() or not informations["long"]) and ("unsigned" not in informations.keys() or informations["unsigned"]):
+        return True
+    else:
+        return False
+
+def isLong(informations):
+    """
+    Return True if the value is a long.
+    """
+    if "long" in informations.keys() and informations["long"] and "unsigned" not in informations.keys():
+        return True
+    else:
+        return False
+
+def isUnsigned(informations):
+    """
+    Return True if the value is an unsigned.
+    """
+    if "unsigned" in informations.keys() and informations["unsigned"] and "long" not in informations.keys():
+        return True
+    else:
+        return False
+
+def isUnsignedLong(informations):
+    """
+    Return True if the value is an unsigned long.
+    """
+    if "unsigned" in informations.keys() and "long" in informations.keys() and informations["unsigned"] and informations["long"]:
+        return True
+    else:
+        return False
\ No newline at end of file