X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=5436a3b3bd5afb53e9bc88ac61ef1d791f6ec575;hb=c0b47b9b31223e15e4edc69ac66cafe572f3b0dd;hp=52d8acea59240d509949a1d550d20334158f0f5a;hpb=3816a34bc452a608f5838ef5a4277f608ea4e313;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 52d8acea..5436a3b3 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")
@@ -23,7 +24,9 @@ def isBertosDir(directory):
 def bertosVersion(directory):
    return open(directory + "/VERSION").readline().strip()
 
-def createBertosProject(directory, sources_dir, projectInfos):
+def createBertosProject(projectInfos):
+    directory = projectInfos.info("PROJECT_PATH")
+    sourcesDir = projectInfos.info("SOURCES_PATH")
     if not os.path.isdir(directory):
         os.mkdir(directory)
     f = open(directory + "/project.bertos", "w")
@@ -32,16 +35,61 @@ def createBertosProject(directory, sources_dir, projectInfos):
     ## Destination source dir
     srcdir = directory + "/bertos"
     shutil.rmtree(srcdir, True)
-    shutil.copytree(sources_dir + "/bertos", srcdir)
+    shutil.copytree(sourcesDir + "/bertos", srcdir)
     ## Destination makefile
     makefile = directory + "/Makefile"
     if os.path.exists(makefile):
         os.remove(makefile)
-    shutil.copy(sources_dir + "/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)
     os.mkdir(prjdir)
+    ## Destination configurations files
+    cfgdir = prjdir + "/cfg"
+    shutil.rmtree(cfgdir, True)
+    os.mkdir(cfgdir)
+    for key, value in projectInfos.info("CONFIGURATIONS").items():
+        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)
+        f = open(cfgdir + "/" + os.path.basename(key), "w")
+        f.write(string)
+        f.close()
+    ## Destinatio mk file
+    makefile = open("mktemplates/template.mk", "r").read()
+    makefile = mkGenerator(projectInfos, makefile)
+    open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile)
+
+def mkGenerator(projectInfos, makefile):
+    """
+    Generates the mk file for the current project.
+    """
+    mkData = {}
+    mkData["pname"] = os.path.basename(projectInfos.info("PROJECT_PATH"))
+    mkData["cpuname"] = projectInfos.info("CPU_INFOS")["CPU_NAME"]
+    mkData["cflags"] = " ".join(projectInfos.info("CPU_INFOS")["C_FLAGS"])
+    mkData["ldflags"] = " ".join(projectInfos.info("CPU_INFOS")["LD_FLAGS"])
+    for key in mkData:
+        while makefile.find(key) != -1:
+            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"]
@@ -156,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):
     """
@@ -177,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):
     """
@@ -205,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):
     """