X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2Fbertos_utils.py;h=c2de0045ba4aab2a31b41390bd04affebd698432;hb=33b67a401701160b8026acc14a5bf0003abb89a4;hp=c0dc0867b0088095bc27a64a0e7afdc56f33b55a;hpb=f89fe8efdb8b81d7d1f29e241df3b40042c42712;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index c0dc0867..c2de0045 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -40,6 +40,7 @@ import re import shutil # Use custom copytree function import copytree +import relpath import pickle import const @@ -113,19 +114,24 @@ def projectFileGenerator(project_info): if project_info.info("PRESET"): # For presets save again the BERTOS_PATH into project file project_data["PRESET"] = True - project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH") + project_data["BERTOS_PATH"] = relpath.relpath(project_info.info("BERTOS_PATH"), directory) + elif project_info.edit: + # If in editing mode the BERTOS_PATH is maintained + project_data["BERTOS_PATH"] = relpath.relpath(project_info.info("BERTOS_PATH"), directory) else: # Use the local BeRTOS version instead of the original one # project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH") - project_data["BERTOS_PATH"] = directory + project_data["BERTOS_PATH"] = "." project_data["PROJECT_NAME"] = project_info.info("PROJECT_NAME", os.path.basename(directory)) - project_data["PROJECT_SRC_PATH"] = project_info.info("PROJECT_SRC_PATH") + project_src_relpath = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), directory) + project_data["PROJECT_SRC_PATH"] = project_src_relpath 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") project_data["WIZARD_VERSION"] = WIZARD_VERSION project_data["PRESET"] = project_info.info("PRESET") + project_data["PROJECT_HW_PATH"] = relpath.relpath(project_info.info("PROJECT_HW_PATH"), directory) return pickle.dumps(project_data) def loadPlugin(plugin): @@ -138,17 +144,28 @@ def versionFileGenerator(project_info, version_file): version = bertosVersion(project_info.info("BERTOS_PATH")) return version_file.replace('$version', version) +def userMkGeneratorFromPreset(project_info): + project_name = project_info.info("PROJECT_NAME") + preset_path = project_info.info("PRESET_PATH") + preset_name = project_info.info("PRESET_NAME") + preset_src_dir = project_info.info("PRESET_SRC_PATH") + makefile = open(os.path.join(preset_path, preset_src_dir, "%s_user.mk" %preset_name), 'r').read() + destination = os.path.join(project_info.prjdir, "%s_user.mk" %project_info.info("PROJECT_NAME")) + # Temporary code. + # TODO: write it using regular expressions to secure this function + makefile = makefile.replace(preset_name + "_", project_name + "_") + open(destination, "w").write(makefile) + def userMkGenerator(project_info): makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template_user.mk"), "r").read() destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + "_user.mk") # Deadly performances loss was here :( mk_data = {} mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) - mk_data["$ppath"] = os.path.basename(project_info.info("PROJECT_SRC_PATH")) - mk_data["$main"] = os.path.basename(project_info.info("PROJECT_PATH")) + "/main.c" + mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")) + mk_data["$main"] = os.path.join("$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c") for key in mk_data: - while makefile.find(key) != -1: - makefile = makefile.replace(key, mk_data[key]) + makefile = makefile.replace(key, mk_data[key]) open(destination, "w").write(makefile) def mkGenerator(project_info): @@ -159,7 +176,7 @@ def mkGenerator(project_info): destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + ".mk") mk_data = {} mk_data["$pname"] = project_info.info("PROJECT_NAME") - mk_data["$ppath"] = os.path.basename(project_info.info("PROJECT_SRC_PATH")) + mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), 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(): @@ -169,10 +186,9 @@ def mkGenerator(project_info): 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["$hwpath"] = relpath.relpath(project_info.info("PROJECT_HW_PATH"), project_info.info("PROJECT_PATH")) for key in mk_data: - while makefile.find(key) != -1: - makefile = makefile.replace(key, mk_data[key]) + makefile = makefile.replace(key, mk_data[key]) open(destination, "w").write(makefile) def makefileGenerator(project_info): @@ -184,10 +200,9 @@ def makefileGenerator(project_info): # TODO write a general function that works for both the mk file and the Makefile mk_data = {} mk_data["$pname"] = project_info.info("PROJECT_NAME") - mk_data["$ppath"] = os.path.basename(project_info.info("PROJECT_SRC_PATH")) + mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")) for key in mk_data: - while makefile.find(key) != -1: - makefile = makefile.replace(key, mk_data[key]) + makefile = makefile.replace(key, mk_data[key]) open(destination, "w").write(makefile) def csrcGenerator(project_info): @@ -283,12 +298,13 @@ def findModuleFiles(module, project_info): try: version_string = bertosVersion(project_info.info("BERTOS_PATH")) version_list = [int(i) for i in version_string.split()[-1].split('.')] - if version_list < [2, 5]: - # For older versions of BeRTOS add the toolchain to the tags - tags.append(project_info.info("CPU_INFOS")["TOOLCHAIN"]) except ValueError: - # If the version file hasn't a valid version number do nothing - pass + # If the version file hasn't a valid version number assume it's an older + # project. + version_list = [0, 0] + if version_list < [2, 5]: + # For older versions of BeRTOS add the toolchain to the tags + tags.append(project_info.info("CPU_INFOS")["TOOLCHAIN"]) for tag in tags: for filename, path in project_info.searchFiles(module + "_" + tag + ".c"): @@ -308,8 +324,7 @@ def replaceSeparators(path): Replace the separators in the given path with unix standard separator. """ if os.sep != "/": - while path.find(os.sep) != -1: - path = path.replace(os.sep, "/") + path = path.replace(os.sep, "/") return path def getSystemPath():