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")
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):