X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=619371ad663ca60c6e8097c735f79c232ec3cf0f;hb=c6e223c861ba70c2695598b2c998fc0edc48f018;hp=972438df4781643e7a69c757c38f8f134220aa08;hpb=3234ec653302eb271f87197429f1f6cbd8f0bdb7;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 972438df..619371ad 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -28,7 +28,6 @@ # # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # -# $Id$ # # Author: Lorenzo Berni # @@ -40,6 +39,7 @@ import re import shutil # Use custom copytree function import copytree +import relpath import pickle import const @@ -50,6 +50,15 @@ from _wizard_version import WIZARD_VERSION from LoadException import VersionException, ToolchainException +def _cmp(x, y): + result = cmp(x["info"].get('ord', 0), y["info"].get('ord', 0)) + if result == 0: + result = cmp( + x["info"].get("name", x["info"]["filename"]).lower(), + y["info"].get("name", y["info"]["filename"]).lower() + ) + return result + def isBertosDir(directory): return os.path.exists(directory + "/VERSION") @@ -111,20 +120,26 @@ def projectFileGenerator(project_info): enabled_modules.append(module) project_data["ENABLED_MODULES"] = enabled_modules if project_info.info("PRESET"): - # For presets save again the SOURCES_PATH into project file + # For presets save again the BERTOS_PATH into project file project_data["PRESET"] = True - project_data["SOURCES_PATH"] = project_info.info("SOURCES_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["SOURCES_PATH"] = project_info.info("SOURCES_PATH") - project_data["SOURCES_PATH"] = directory + # project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH") + 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): @@ -134,24 +149,43 @@ def loadPlugin(plugin): return getattr(__import__("plugins", {}, {}, [plugin]), plugin) def versionFileGenerator(project_info, version_file): - version = bertosVersion(project_info.info("SOURCES_PATH")) + version = bertosVersion(project_info.info("BERTOS_PATH")) return version_file.replace('$version', version) -def userMkGenerator(project_info, makefile): +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["$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"] = "/".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]) - return makefile + makefile = makefile.replace(key, mk_data[key]) + open(destination, "w").write(makefile) -def mkGenerator(project_info, makefile): +def mkGenerator(project_info): """ Generates the mk file for the current project. """ + makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read() + prjdir = os.path.abspath(project_info.prjdir) + destination = os.path.join(prjdir, os.path.basename(prjdir) + ".mk") mk_data = {} mk_data["$pname"] = project_info.info("PROJECT_NAME") + 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(): @@ -159,22 +193,26 @@ def mkGenerator(project_info, makefile): 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["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].rsplit("gcc", 1)[0]) + mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].rsplit("gcc", 1)[1]) + 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]) - return makefile + makefile = makefile.replace(key, mk_data[key]) + open(destination, "w").write(makefile) -def makefileGenerator(project_info, makefile): +def makefileGenerator(project_info): """ Generate the Makefile for the current project. """ + makefile = open(os.path.join(const.DATA_DIR, "mktemplates/Makefile"), "r").read() + destination = os.path.join(project_info.maindir, "Makefile") # TODO write a general function that works for both the mk file and the Makefile - while makefile.find("$pname") != -1: - makefile = makefile.replace("$pname", project_info.info("PROJECT_NAME")) - return makefile + mk_data = {} + mk_data["$pname"] = project_info.info("PROJECT_NAME") + mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")) + for key in mk_data: + makefile = makefile.replace(key, mk_data[key]) + open(destination, "w").write(makefile) def csrcGenerator(project_info): modules = project_info.info("MODULES") @@ -200,7 +238,7 @@ def csrcGenerator(project_info): dependency_files = set([]) # assembly sources asm_files = set([]) - hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" + hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" if information["enabled"]: if "constants" in information: constants.update(information["constants"]) @@ -252,13 +290,13 @@ def findModuleFiles(module, project_info): sfiles = [] # .c files related to the module and the cpu architecture for filename, path in project_info.searchFiles(module + ".c"): - path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = path.replace(project_info.info("BERTOS_PATH") + os.sep, "") path = replaceSeparators(path) cfiles.append(path + "/" + filename) # .s files related to the module and the cpu architecture for filename, path in project_info.searchFiles(module + ".s") + \ project_info.searchFiles(module + ".S"): - path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = path.replace(project_info.info("BERTOS_PATH") + os.sep, "") path = replaceSeparators(path) sfiles.append(path + "/" + filename) # .c and .s files related to the module and the cpu tags @@ -267,24 +305,25 @@ def findModuleFiles(module, project_info): # Awful, but secure check for version # TODO: split me in a method/function try: - version_string = bertosVersion(project_info.info("SOURCES_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"]) + version_string = bertosVersion(project_info.info("BERTOS_PATH")) + version_list = [int(i) for i in version_string.split()[1].split('.')] 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"): - path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = path.replace(project_info.info("BERTOS_PATH") + os.sep, "") if os.sep != "/": path = replaceSeparators(path) cfiles.append(path + "/" + filename) for filename, path in project_info.searchFiles(module + "_" + tag + ".s") + \ project_info.searchFiles(module + "_" + tag + ".S"): - path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") + path = path.replace(project_info.info("BERTOS_PATH") + os.sep, "") path = replaceSeparators(path) sfiles.append(path + "/" + filename) return cfiles, sfiles @@ -294,8 +333,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(): @@ -310,7 +348,8 @@ def findToolchains(path_list): toolchains = [] for element in path_list: for toolchain in glob.glob(element+ "/" + const.GCC_NAME): - toolchains.append(toolchain) + if not os.path.isdir(toolchain): + toolchains.append(toolchain) return list(set(toolchains)) def getToolchainInfo(output): @@ -350,7 +389,7 @@ def getTagSet(cpu_info): tag_set |= set(cpu["CPU_TAGS"]) tag_set |= set([cpu["TOOLCHAIN"]]) return tag_set - + def getInfos(definition): D = {}