X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=8ad1568b1d9280b1ce60cc844176eb31f1370eca;hb=5e75e84ec8e806f7ded1207b395be2fb09a60a35;hp=b57801a0fe6ef6db2658d510cc071d941ad35adb;hpb=9b2a54e784f116cc9b4f770e1acbc15c4c5f013a;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index b57801a0..8ad1568b 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -59,6 +59,8 @@ def loadBertosProject(project_file): project_info.setInfo("PROJECT_PATH", os.path.dirname(project_file)) project_info.setInfo("SOURCES_PATH", project_data["SOURCES_PATH"]) project_info.setInfo("TOOLCHAIN", project_data["TOOLCHAIN"]) + project_info.setInfo("SELECTED_FREQ", project_data["SELECTED_FREQ"]) + project_info.setInfo("OUTPUT", project_data["OUTPUT"]) loadSourceTree(project_info) cpu_name = project_data["CPU_NAME"] project_info.setInfo("CPU_NAME", cpu_name) @@ -80,8 +82,16 @@ def loadBertosProject(project_file): tag_dict[tag] = False project_info.setInfo("ALL_CPU_TAGS", tag_dict) loadModuleData(project_info, True) + modules = project_info.info("MODULES") + for module, information in modules.items(): + information["enabled"] = module in project_data["ENABLED_MODULES"] + project_info.setInfo("MODULES", modules) return project_info +def mergeSources(srcdir, new_sources, old_sources): + # TODO: implement the three way merge algorithm + pass + def projectFileGenerator(project_info): directory = project_info.info("PROJECT_PATH") project_data = {} @@ -94,53 +104,70 @@ def projectFileGenerator(project_info): project_data["TOOLCHAIN"] = project_info.info("TOOLCHAIN") project_data["CPU_NAME"] = project_info.info("CPU_NAME") project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ") + project_data["OUTPUT"] = project_info.info("OUTPUT") return pickle.dumps(project_data) -def createBertosProject(project_info): +def createBertosProject(project_info, edit=False): directory = project_info.info("PROJECT_PATH") sources_dir = project_info.info("SOURCES_PATH") - if os.path.isdir(directory): - shutil.rmtree(directory, True) - os.makedirs(directory) + if not edit: + if os.path.isdir(directory): + shutil.rmtree(directory, True) + os.makedirs(directory) + # Write the project file f = open(directory + "/project.bertos", "w") f.write(projectFileGenerator(project_info)) f.close() # Destination source dir srcdir = directory + "/bertos" - shutil.rmtree(srcdir, True) - copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST) + if not edit: + # 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: + # 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 # Destination makefile makefile = directory + "/Makefile" - if os.path.exists(makefile): - os.remove(makefile) makefile = open("mktemplates/Makefile").read() makefile = makefileGenerator(project_info, makefile) open(directory + "/Makefile", "w").write(makefile) # Destination project dir prjdir = directory + "/" + os.path.basename(directory) - shutil.rmtree(prjdir, True) - os.mkdir(prjdir) + if not edit: + shutil.rmtree(prjdir, True) + os.mkdir(prjdir) # Destination hw files hwdir = prjdir + "/hw" - shutil.rmtree(hwdir, True) - os.mkdir(hwdir) + if not edit: + shutil.rmtree(hwdir, True) + os.mkdir(hwdir) # Copy all the hw files for module, information in project_info.info("MODULES").items(): for hwfile in information["hw"]: string = open(sources_dir + "/" + hwfile, "r").read() - open(hwdir + "/" + os.path.basename(hwfile), "w").write(string) + hwfile_path = hwdir + "/" + os.path.basename(hwfile) + if not edit or not os.path.exists(hwfile_path): + # If not in editing mode it copies all the hw files. If in + # editing mode it copies only the files that don't exist yet + open(hwdir + "/" + os.path.basename(hwfile), "w").write(string) # Destination configurations files cfgdir = prjdir + "/cfg" - shutil.rmtree(cfgdir, True) - os.mkdir(cfgdir) - # Set to 1 the autoenabled for enabled modules + if not edit: + shutil.rmtree(cfgdir, True) + os.mkdir(cfgdir) + # Set properly the autoenabled parameters for module, information in project_info.info("MODULES").items(): - if information["enabled"] and "configuration" in information and information["configuration"] != "": + if "configuration" in information and information["configuration"] != "": configurations = project_info.info("CONFIGURATIONS") configuration = configurations[information["configuration"]] for start, parameter in configuration["paramlist"]: if "type" in configuration[parameter]["informations"] and configuration[parameter]["informations"]["type"] == "autoenabled": - configuration[parameter]["value"] = "1" + configuration[parameter]["value"] = "1" if information["enabled"] else "0" project_info.setInfo("CONFIGURATIONS", configurations) # Copy all the configuration files for configuration, information in project_info.info("CONFIGURATIONS").items(): @@ -156,13 +183,19 @@ def createBertosProject(project_info): f = open(cfgdir + "/" + os.path.basename(configuration), "w") f.write(string) f.close() - # Destinatio mk file - makefile = open("mktemplates/template.mk", "r").read() + if not edit: + # Destination user mk file (only on project creation) + makefile = open("mktemplates/template.mk", "r").read() + makefile = mkGenerator(project_info, makefile) + open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile) + # Destination wizard mk file + makefile = open("mktemplates/template_wiz.mk", "r").read() makefile = mkGenerator(project_info, makefile) - open(prjdir + "/" + os.path.basename(prjdir) + ".mk", "w").write(makefile) + open(prjdir + "/" + os.path.basename(prjdir) + "_wiz.mk", "w").write(makefile) # Destination main.c file - main = open("srctemplates/main.c", "r").read() - open(prjdir + "/main.c", "w").write(main) + if not edit: + main = open("srctemplates/main.c", "r").read() + open(prjdir + "/main.c", "w").write(main) # Files for selected plugins relevants_files = {} for plugin in project_info.info("OUTPUT"): @@ -196,6 +229,9 @@ def mkGenerator(project_info, makefile): 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]) @@ -206,8 +242,8 @@ def makefileGenerator(project_info, makefile): Generate the Makefile for the current project. """ # TODO write a general function that works for both the mk file and the Makefile - while makefile.find("project_name") != -1: - makefile = makefile.replace("project_name", os.path.basename(project_info.info("PROJECT_PATH"))) + while makefile.find("$pname") != -1: + makefile = makefile.replace("$pname", os.path.basename(project_info.info("PROJECT_PATH"))) return makefile def csrcGenerator(project_info):