tag_dict[element] = False
infos = project_info.info("CPU_INFOS")
for tag in tag_dict:
- if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["CORE_CPU"], infos["TOOLCHAIN"]]:
+ if tag in infos["CPU_TAGS"] + [infos["CPU_NAME"], infos["TOOLCHAIN"]]:
tag_dict[tag] = True
else:
tag_dict[tag] = False
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)
# 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()
mk_data = {}
mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
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])
mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].split("gcc")[1])
mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c"
- mk_data["$programmercpu"] = project_info.info("CPU_INFOS")["PROGRAMMER_CPU"]
- mk_data["$flashscript"] = project_info.info("CPU_INFOS")["FLASH_SCRIPT"]
- mk_data["$debugscript"] = project_info.info("CPU_INFOS")["DEBUG_SCRIPT"]
for key in mk_data:
while makefile.find(key) != -1:
makefile = makefile.replace(key, mk_data[key])
for cpu in cpu_info:
tag_set |= set([cpu["CPU_NAME"]])
tag_set |= set(cpu["CPU_TAGS"])
- tag_set |= set([cpu["CORE_CPU"]])
tag_set |= set([cpu["TOOLCHAIN"]])
return tag_set