X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=7be67fe10cdfcafb24b897cc4dc0ae8d36c22935;hb=HEAD;hp=8d4b644917a0664c8905ac0beac9dbf1ceee3bc1;hpb=35aeb5229a132f6555b1eff44ba2a00596003f22;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 8d4b6449..7be67fe1 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 # @@ -51,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") @@ -110,24 +118,30 @@ def projectFileGenerator(project_info): for module, information in project_info.info("MODULES").items(): if information["enabled"]: enabled_modules.append(module) - project_data["ENABLED_MODULES"] = enabled_modules + project_data["ENABLED_MODULES"] = sorted(enabled_modules) 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_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["PROJECT_SRC_PATH_FROM_MAKEFILE"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE") + project_data["TOOLCHAIN"] = {'path': project_info.info("TOOLCHAIN")['path']} 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) + project_data["PROJECT_HW_PATH_FROM_MAKEFILE"] = project_info.info("PROJECT_HW_PATH_FROM_MAKEFILE") return pickle.dumps(project_data) def loadPlugin(plugin): @@ -140,17 +154,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"] = 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") + mk_data["$ppath"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE") + 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]) + makefile = makefile.replace(key, mk_data[key]) open(destination, "w").write(makefile) def mkGenerator(project_info): @@ -158,10 +183,11 @@ 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() - destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + ".mk") + 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["$ppath"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE") mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ") cpu_mk_parameters = [] for key, value in project_info.info("CPU_INFOS").items(): @@ -169,11 +195,11 @@ def mkGenerator(project_info): 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["$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"] = project_info.info("PROJECT_HW_PATH_FROM_MAKEFILE") 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): @@ -185,10 +211,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"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE") 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): @@ -215,7 +240,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"]) @@ -248,17 +273,17 @@ def csrcGenerator(project_info): cxxsrc.append(file) for file in project_info.info("CPU_INFOS")["ASRC"]: asrc.append(file) - csrc = set(csrc) + csrc = sorted(set(csrc)) csrc = " \\\n\t".join(csrc) + " \\" - pcsrc = set(pcsrc) + pcsrc = sorted(set(pcsrc)) pcsrc = " \\\n\t".join(pcsrc) + " \\" - cppasrc = set(cppasrc) + cppasrc = sorted(set(cppasrc)) cppasrc = " \\\n\t".join(cppasrc) + " \\" - cxxsrc = set(cxxsrc) + cxxsrc = sorted(set(cxxsrc)) cxxsrc = " \\\n\t".join(cxxsrc) + " \\" - asrc = set(asrc) + asrc = sorted(set(asrc)) asrc = " \\\n\t".join(asrc) + " \\" - constants = "\n".join([os.path.basename(project_info.info("PROJECT_PATH")) + "_" + key + " = " + unicode(value) for key, value in constants.items()]) + constants = "\n".join([project_info.info("PROJECT_NAME") + "_" + key + " = " + unicode(value) for key, value in constants.items()]) return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants def findModuleFiles(module, project_info): @@ -283,7 +308,7 @@ def findModuleFiles(module, project_info): # TODO: split me in a method/function try: version_string = bertosVersion(project_info.info("BERTOS_PATH")) - version_list = [int(i) for i in version_string.split()[-1].split('.')] + version_list = [int(i) for i in version_string.split()[1].split('.')] except ValueError: # If the version file hasn't a valid version number assume it's an older # project. @@ -310,23 +335,28 @@ 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(): path = os.environ["PATH"] - if os.name == "nt": - path = path.split(";") - else: - path = path.split(":") + path = path.split(os.pathsep) return path +def findInPath(file, path=None): + if path is None: + path = os.environ.get('PATH', '') + if type(path) is type(''): + path = path.split(os.pathsep) + return filter(os.path.exists, map(lambda dir, file=file: os.path.join(dir, file), path)) + + 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): @@ -366,7 +396,7 @@ def getTagSet(cpu_info): tag_set |= set(cpu["CPU_TAGS"]) tag_set |= set([cpu["TOOLCHAIN"]]) return tag_set - + def getInfos(definition): D = {}