X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2Fbertos_utils.py;h=d3e7127eed4dbab8b40feeace72193e83f297630;hb=695e044f1387440a718abf42a79800e785f71c7f;hp=df26613f66785a662666a44edb5a076719566775;hpb=0baa18b329a9bc006fc74f7ef65581b04b43cfb7;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index df26613f..d3e7127e 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -23,15 +23,41 @@ 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")
     f.write(repr(projectInfos))
     f.close()
-    shutil.rmtree(directory + "/bertos", True)
-    shutil.copytree(sources_dir + "/bertos", directory + "/bertos")
-    shutil.copy(sources_dir + "/Makefile", directory + "/Makefile")
+    ## Destination source dir
+    srcdir = directory + "/bertos"
+    shutil.rmtree(srcdir, True)
+    shutil.copytree(sourcesDir + "/bertos", srcdir)
+    ## Destination makefile
+    makefile = directory + "/Makefile"
+    if os.path.exists(makefile):
+        os.remove(makefile)
+    shutil.copy(sourcesDir + "/Makefile", 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 "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()
 
 def getSystemPath():
     path = os.environ["PATH"]
@@ -213,4 +239,10 @@ def loadDefineListsDict(path):
     defineListsDict = {}
     for filename, path in findDefinitions("*.h", path):
         defineListsDict.update(loadDefineLists(path + "/" + filename))
-    return defineListsDict
\ No newline at end of file
+    return defineListsDict
+
+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)