Add the final L in the long ints
[bertos.git] / wizard / bertos_utils.py
index 6fbd254acdb6d52f8d1d528c853bcda9944dda20..f224c6b0b122e142ca244636b657f47150caee5b 100644 (file)
@@ -16,6 +16,7 @@ import re
 import shutil
 
 import const
+import DefineException
 
 def isBertosDir(directory):
    return os.path.exists(directory + "/VERSION")
@@ -39,7 +40,9 @@ def createBertosProject(projectInfos):
     makefile = directory + "/Makefile"
     if os.path.exists(makefile):
         os.remove(makefile)
-    shutil.copy(sourcesDir + "/Makefile", makefile)
+    makefile = open("mktemplates/Makefile").read()
+    makefile = makefileGenerator(projectInfos, makefile)
+    open(directory + "/Makefile", "w").write(makefile)
     ## Destination project dir
     prjdir = directory + "/" + os.path.basename(directory)
     shutil.rmtree(prjdir, True)
@@ -52,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)
@@ -61,7 +66,7 @@ def createBertosProject(projectInfos):
     ## Destinatio mk file
     makefile = open("mktemplates/template.mk", "r").read()
     makefile = mkGenerator(projectInfos, makefile)
-    open(prjdir + "/" + "template.mk", "w").write(makefile)
+    open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile)
 
 def mkGenerator(projectInfos, makefile):
     """
@@ -77,6 +82,15 @@ def mkGenerator(projectInfos, makefile):
             makefile = makefile.replace(key, mkData[key])
     return makefile
 
+def makefileGenerator(projectInfos, makefile):
+    """
+    Generate the Makefile for the current project.
+    """
+    # TODO: write a general function that works for both the mk file and the Makefile
+    while makefile.find("project_name") != -1:
+        makefile = makefile.replace("project_name", os.path.basename(projectInfos.info("PROJECT_PATH")))
+    return makefile
+
 def getSystemPath():
     path = os.environ["PATH"]
     if os.name == "nt":
@@ -190,15 +204,18 @@ 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
+            configurationInfos[name]["description"] = description
+        return configurationInfos
+    except SyntaxError:
+        raise DefineException.ConfigurationDefineException(path)
 
 def loadModuleInfos(path):
     """
@@ -211,20 +228,23 @@ 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}
+                return moduleInfos
+        return {}
+    except SyntaxError:
+        raise DefineException.ModuleDefineException(path)
 
 def loadModuleInfosDict(path):
     """
@@ -239,16 +259,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):
     """
@@ -264,3 +287,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(value):
+    """
+    Return True if the value is a simple int.
+    """
+    if "long" not in value["informations"].keys() and "unsigned" not in value["informations"].keys():
+        return True
+    else:
+        return False
+
+def isLong(value):
+    """
+    Return True if the value is a long.
+    """
+    if "long" not in value["informations"].keys() and value["informations"]["long"] and "unsigned" not in value["informations"].key():
+        return True
+    else:
+        return False
+
+def isUnsigned(value):
+    """
+    Return True if the value is an unsigned.
+    """
+    if "unsigned" not in value["informations"].keys() and value["informations"]["unsigned"] and "long" not in value["informations"].key():
+        return True
+    else:
+        return False
+
+def isUnsignedLong(value):
+    """
+    Return True if the value is an unsigned long.
+    """
+    if "unsigned" in value["informations"].keys() and "long" in value["informations"].keys() and value["informations"]["unsigned"] and value["informations"]["long"]:
+        return True
+    else:
+        return False
\ No newline at end of file