X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=401713f61a4f010a21a68440357b7f2fd13f7f7f;hb=4d4f5228c8564b83cb232b8c33b8c039acd31efc;hp=fcfa3da7097c3a10f3a9f49310d927588ac8f865;hpb=019ad4b6e3fca2cbe5e739c94385aadd8dd16bfa;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index fcfa3da7..401713f6 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -89,8 +89,13 @@ def loadBertosProject(project_file):
     return project_info
 
 def mergeSources(srcdir, new_sources, old_sources):
+    # The current mergeSources function provide only a raw copy of the sources in the
+    # created project.
+    #
     # TODO: implement the three way merge algorithm
-    pass
+    #
+    shutil.rmtree(srcdir, True)
+    copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
 
 def projectFileGenerator(project_info):
     directory = project_info.info("PROJECT_PATH")
@@ -110,6 +115,7 @@ def projectFileGenerator(project_info):
 def createBertosProject(project_info, edit=False):
     directory = project_info.info("PROJECT_PATH")
     sources_dir = project_info.info("SOURCES_PATH")
+    old_sources_dir = project_info.info("OLD_SOURCES_PATH")
     if not edit:
         if os.path.isdir(directory):
             shutil.rmtree(directory, True)        
@@ -124,13 +130,11 @@ def createBertosProject(project_info, edit=False):
         # If not in editing mode it copies all the bertos sources in the /bertos subdirectory of the project
         shutil.rmtree(srcdir, True)
         copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
-    else:
+    elif old_sources_dir:
         # If in editing mode it merges the current bertos sources with the selected ones
         # TODO: implement the three way merge algotihm
         #
-        # mergeSources(srcdir, sources_dir, old_sources_dir)
-        #
-        pass
+        mergeSources(srcdir, sources_dir, old_sources_dir)
     # Destination makefile
     makefile = directory + "/Makefile"
     makefile = open("mktemplates/Makefile").read()
@@ -218,8 +222,8 @@ def mkGenerator(project_info, makefile):
     mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ")
     cpu_mk_parameters = []
     for key, value in project_info.info("CPU_INFOS").items():
-        if key.startswith("MK_"):
-            cpu_mk_parameters.append("%s = %s" %(key.replace("MK_", mk_data["$pname"]), value))
+        if key.startswith(const.MK_PARAM_ID):
+            cpu_mk_parameters.append("%s = %s" %(key.replace("MK", mk_data["$pname"]), value))
     mk_data["$cpuparameters"] = "\n".join(cpu_mk_parameters)
     mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info)
     mk_data["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[0])