X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=e17a4ed586d6bebc090619913d6fb2cc3a659674;hb=2d3ad21b9ff6ece02acb8eafdd5e316eebb2d499;hp=f0a1bc7fc2fad09f767cc42ba6a13dfad4f82f22;hpb=e0a72456d5be2386c8bae635b5e36d7312c55353;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index f0a1bc7f..e17a4ed5 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -82,15 +82,38 @@ def loadBertosProject(project_file):
             tag_dict[tag] = False
     project_info.setInfo("ALL_CPU_TAGS", tag_dict)
     loadModuleData(project_info, True)
+    setEnabledModules(project_info, project_data["ENABLED_MODULES"])
+    return project_info
+
+def setEnabledModules(project_info, enabled_modules):
     modules = project_info.info("MODULES")
+    files = {}
     for module, information in modules.items():
-        information["enabled"] = module in project_data["ENABLED_MODULES"]
+        information["enabled"] = module in enabled_modules
+	for dependency in information["depends"]:
+            if not dependency in modules:
+	        if dependency in files:
+		    files[dependency] += 1
+		else:
+		    files[dependency] = 1
     project_info.setInfo("MODULES", modules)
-    return project_info
+    project_info.setInfo("FILES", files)
+
+def enabledModules(project_info):
+    enabled_modules = []
+    for name, module in project_info.info("MODULES").items():
+        if module["enabled"]:
+            enabled_modules.append(name)
+    return enabled_modules
 
 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(os.path.join(new_sources, "bertos"), srcdir, ignore_list=const.IGNORE_LIST)
 
 def projectFileGenerator(project_info):
     directory = project_info.info("PROJECT_PATH")
@@ -110,6 +133,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 +148,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,7 +240,7 @@ 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_"):
+        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)
@@ -297,10 +319,15 @@ def csrcGenerator(project_info):
         cxxsrc.append(file)
     for file in project_info.info("CPU_INFOS")["ASRC"]:
         asrc.append(file)
+    csrc = set(csrc)
     csrc = " \\\n\t".join(csrc) + " \\"
+    pcsrc = set(pcsrc)
     pcsrc = " \\\n\t".join(pcsrc) + " \\"
+    cppasrc = set(cppasrc)
     cppasrc = " \\\n\t".join(cppasrc) + " \\"
+    cxxsrc = set(cxxsrc)
     cxxsrc = " \\\n\t".join(cxxsrc) + " \\"
+    asrc = set(asrc)
     asrc = " \\\n\t".join(asrc) + " \\"
     constants = "\n".join([os.path.basename(project_info.info("PROJECT_PATH")) + "_" + key + " = " + unicode(value) for key, value in constants.items()])
     return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants
@@ -675,7 +702,8 @@ def loadConfigurationInfos(path):
 
 def updateConfigurationValues(def_conf, user_conf):
     for param in def_conf["paramlist"]:
-        def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
+        if param[1] in user_conf and "value" in user_conf[param[1]]:
+            def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
     return def_conf
 
 def findParameterType(parameter):