X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=0fbb953245706b918c0e01529ee344aca9f11b9c;hb=6a566c9b4ad8efa9ee8432942b85ba31ffb469f8;hp=e17a4ed586d6bebc090619913d6fb2cc3a659674;hpb=25b3954d828a80625b69aa646d21166c21b64b53;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index e17a4ed5..0fbb9532 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -47,21 +47,38 @@ import plugins import DefineException import BProject +from _wizard_version import WIZARD_VERSION + +from LoadException import VersionException, ToolchainException + def isBertosDir(directory): return os.path.exists(directory + "/VERSION") def bertosVersion(directory): return open(directory + "/VERSION").readline().strip() -def loadBertosProject(project_file): +def loadBertosProject(project_file, info_dict): + project_dir = os.path.dirname(project_file) project_data = pickle.loads(open(project_file, "r").read()) project_info = BProject.BProject() + # If PROJECT_NAME is not defined it use the directory name as PROJECT_NAME + # NOTE: this can throw an Exception if the user has changed the directory containing the project + project_info.setInfo("PROJECT_NAME", project_data.get("PROJECT_NAME", os.path.basename(project_dir))) 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) + # Check for the Wizard version + wizard_version = project_data.get("WIZARD_VERSION", 0) + # Ignore the SOURCES_PATH inside the project file + project_data["SOURCES_PATH"] = project_dir + if "SOURCES_PATH" in info_dict: + project_data["SOURCES_PATH"] = info_dict["SOURCES_PATH"] + if os.path.exists(project_data["SOURCES_PATH"]): + project_info.setInfo("SOURCES_PATH", project_data["SOURCES_PATH"]) + else: + raise VersionException(project_info) + if not isBertosDir(project_dir): + version_file = open(os.path.join(const.DATA_DIR, "vtemplates/VERSION"), "r").read() + open(os.path.join(project_dir, "VERSION"), "w").write(version_file.replace("$version", "").strip()) + project_info.loadSourceTree() cpu_name = project_data["CPU_NAME"] project_info.setInfo("CPU_NAME", cpu_name) cpu_info = loadCpuInfos(project_info) @@ -81,6 +98,14 @@ def loadBertosProject(project_file): else: tag_dict[tag] = False project_info.setInfo("ALL_CPU_TAGS", tag_dict) + if "TOOLCHAIN" in info_dict: + project_data["TOOLCHAIN"] = info_dict["TOOLCHAIN"] + if os.path.exists(project_data["TOOLCHAIN"]["path"]): + project_info.setInfo("TOOLCHAIN", project_data["TOOLCHAIN"]) + else: + raise ToolchainException(project_info) + project_info.setInfo("SELECTED_FREQ", project_data["SELECTED_FREQ"]) + project_info.setInfo("OUTPUT", project_data["OUTPUT"]) loadModuleData(project_info, True) setEnabledModules(project_info, project_data["ENABLED_MODULES"]) return project_info @@ -90,12 +115,10 @@ def setEnabledModules(project_info, enabled_modules): files = {} for module, information in modules.items(): information["enabled"] = module in enabled_modules - for dependency in information["depends"]: - if not dependency in modules: - if dependency in files: - files[dependency] += 1 - else: - files[dependency] = 1 + if information["enabled"]: + for dependency in information["depends"]: + if not dependency in modules: + files[dependency] = files.get(dependency, 0) + 1 project_info.setInfo("MODULES", modules) project_info.setInfo("FILES", files) @@ -123,11 +146,15 @@ def projectFileGenerator(project_info): if information["enabled"]: enabled_modules.append(module) project_data["ENABLED_MODULES"] = enabled_modules - project_data["SOURCES_PATH"] = project_info.info("SOURCES_PATH") + # 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["PROJECT_NAME"] = project_info.info("PROJECT_NAME", os.path.basename(directory)) 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 return pickle.dumps(project_data) def createBertosProject(project_info, edit=False): @@ -142,6 +169,9 @@ def createBertosProject(project_info, edit=False): f = open(directory + "/project.bertos", "w") f.write(projectFileGenerator(project_info)) f.close() + # VERSION file + version_file = open(os.path.join(const.DATA_DIR, "vtemplates/VERSION"), "r").read() + open(directory + "/VERSION", "w").write(versionFileGenerator(project_info, version_file)) # Destination source dir srcdir = directory + "/bertos" if not edit: @@ -155,11 +185,12 @@ def createBertosProject(project_info, edit=False): mergeSources(srcdir, sources_dir, old_sources_dir) # Destination makefile makefile = directory + "/Makefile" - makefile = open("mktemplates/Makefile").read() + makefile = open(os.path.join(const.DATA_DIR, "mktemplates/Makefile"), 'r').read() makefile = makefileGenerator(project_info, makefile) open(directory + "/Makefile", "w").write(makefile) # Destination project dir - prjdir = directory + "/" + os.path.basename(directory) + # prjdir = directory + "/" + os.path.basename(directory) + prjdir = os.path.join(directory, project_info.info("PROJECT_NAME")) if not edit: shutil.rmtree(prjdir, True) os.mkdir(prjdir) @@ -207,16 +238,17 @@ def createBertosProject(project_info, edit=False): f.close() if not edit: # Destination user mk file (only on project creation) - makefile = open("mktemplates/template.mk", "r").read() - makefile = mkGenerator(project_info, makefile) + makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read() + # Deadly performances loss was here :( + makefile = userMkGenerator(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 = open(os.path.join(const.DATA_DIR, "mktemplates/template_wiz.mk"), "r").read() makefile = mkGenerator(project_info, makefile) open(prjdir + "/" + os.path.basename(prjdir) + "_wiz.mk", "w").write(makefile) # Destination main.c file if not edit: - main = open("srctemplates/main.c", "r").read() + main = open(os.path.join(const.DATA_DIR, "srctemplates/main.c"), "r").read() open(prjdir + "/main.c", "w").write(main) # Files for selected plugins relevants_files = {} @@ -230,7 +262,20 @@ def loadPlugin(plugin): Returns the given plugin module. """ return getattr(__import__("plugins", {}, {}, [plugin]), plugin) - + +def versionFileGenerator(project_info, version_file): + version = bertosVersion(project_info.info("SOURCES_PATH")) + return version_file.replace('$version', version) + +def userMkGenerator(project_info, makefile): + 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" + for key in mk_data: + while makefile.find(key) != -1: + makefile = makefile.replace(key, mk_data[key]) + return makefile + def mkGenerator(project_info, makefile): """ Generates the mk file for the current project. @@ -295,8 +340,7 @@ def csrcGenerator(project_info): for file in information["hw"]: if file.endswith(".c"): module_files |= set([hwdir + "/" + os.path.basename(file)]) - for file_dependency in information["depends"]: - if file_dependency in files: + for file_dependency in information["depends"] + tuple(files.keys()): dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info) dependency_files |= set(dependencyCFiles) asm_files |= set(dependencySFiles) @@ -337,28 +381,28 @@ def findModuleFiles(module, project_info): cfiles = [] sfiles = [] # .c files related to the module and the cpu architecture - for filename, path in findDefinitions(module + ".c", project_info) + \ - findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c", project_info): + for filename, path in project_info.findDefinitions(module + ".c") + \ + project_info.findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") path = replaceSeparators(path) cfiles.append(path + "/" + filename) # .s files related to the module and the cpu architecture - for filename, path in findDefinitions(module + ".s", project_info) + \ - findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".s", project_info) + \ - findDefinitions(module + ".S", project_info) + \ - findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S", project_info): + for filename, path in project_info.findDefinitions(module + ".s") + \ + project_info.findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".s") + \ + project_info.findDefinitions(module + ".S") + \ + project_info.findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") path = replaceSeparators(path) sfiles.append(path + "/" + filename) # .c and .s files related to the module and the cpu tags for tag in project_info.info("CPU_INFOS")["CPU_TAGS"]: - for filename, path in findDefinitions(module + "_" + tag + ".c", project_info): + for filename, path in project_info.findDefinitions(module + "_" + tag + ".c"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") if os.sep != "/": path = replaceSeparators(path) cfiles.append(path + "/" + filename) - for filename, path in findDefinitions(module + "_" + tag + ".s", project_info) + \ - findDefinitions(module + "_" + tag + ".S", project_info): + for filename, path in project_info.findDefinitions(module + "_" + tag + ".s") + \ + project_info.findDefinitions(module + "_" + tag + ".S"): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") path = replaceSeparators(path) sfiles.append(path + "/" + filename) @@ -418,22 +462,9 @@ def getToolchainName(toolchain_info): name = "GCC " + toolchain_info["version"] + " - " + toolchain_info["target"].strip() return name -def loadSourceTree(project): - fileList = [f for f in os.walk(project.info("SOURCES_PATH"))] - project.setInfo("FILE_LIST", fileList) - -def findDefinitions(ftype, project): - L = project.info("FILE_LIST") - definitions = [] - for element in L: - for filename in element[2]: - if fnmatch.fnmatch(filename, ftype): - definitions.append((filename, element[0])) - return definitions - -def loadCpuInfos(project): +def loadCpuInfos(project_info): cpuInfos = [] - for definition in findDefinitions(const.CPU_DEFINITION, project): + for definition in project_info.findDefinitions(const.CPU_DEFINITION): cpuInfos.append(getInfos(definition)) return cpuInfos @@ -600,12 +631,12 @@ def getDefinitionBlocks(text): block.append(([comment], define, start)) return block -def loadModuleData(project, edit=False): +def loadModuleData(project_info, edit=False): module_info_dict = {} list_info_dict = {} configuration_info_dict = {} file_dict = {} - for filename, path in findDefinitions("*.h", project) + findDefinitions("*.c", project) + findDefinitions("*.s", project) + findDefinitions("*.S", project): + for filename, path in project_info.findDefinitions("*.h") + project_info.findDefinitions("*.c") + project_info.findDefinitions("*.s") + project_info.findDefinitions("*.S"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) if len(comment_list) > 0: module_info = {} @@ -622,13 +653,13 @@ def loadModuleData(project, edit=False): if "configuration" in information and len(information["configuration"]): configuration = module_dict[module]["configuration"] try: - configuration_info[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration) + configuration_info[configuration] = loadConfigurationInfos(project_info.info("SOURCES_PATH") + "/" + configuration) except ParseError, err: - raise DefineException.ConfigurationDefineException(project.info("SOURCES_PATH") + "/" + configuration, err.line_number, err.line) + raise DefineException.ConfigurationDefineException(project_info.info("SOURCES_PATH") + "/" + configuration, err.line_number, err.line) if edit: try: - path = os.path.basename(project.info("PROJECT_PATH")) - directory = project.info("PROJECT_PATH") + path = project_info.info("PROJECT_NAME") + directory = project_info.info("PROJECT_PATH") user_configuration = loadConfigurationInfos(directory + "/" + configuration.replace("bertos", path)) configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], user_configuration) except ParseError, err: @@ -641,17 +672,17 @@ def loadModuleData(project, edit=False): list_info_dict.update(list_dict) except ParseError, err: raise DefineException.EnumDefineException(path, err.line_number, err.line) - for filename, path in findDefinitions("*_" + project.info("CPU_INFOS")["TOOLCHAIN"] + ".h", project): + for filename, path in project_info.findDefinitions("*_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".h"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) list_info_dict.update(loadDefineLists(comment_list)) - for tag in project.info("CPU_INFOS")["CPU_TAGS"]: - for filename, path in findDefinitions("*_" + tag + ".h", project): + for tag in project_info.info("CPU_INFOS")["CPU_TAGS"]: + for filename, path in project_info.findDefinitions("*_" + tag + ".h"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) list_info_dict.update(loadDefineLists(comment_list)) - project.setInfo("MODULES", module_info_dict) - project.setInfo("LISTS", list_info_dict) - project.setInfo("CONFIGURATIONS", configuration_info_dict) - project.setInfo("FILES", file_dict) + project_info.setInfo("MODULES", module_info_dict) + project_info.setInfo("LISTS", list_info_dict) + project_info.setInfo("CONFIGURATIONS", configuration_info_dict) + project_info.setInfo("FILES", file_dict) def formatParamNameValue(text): """ @@ -674,6 +705,7 @@ def loadConfigurationInfos(path): "long": boolean indicating if the num is a long "unsigned": boolean indicating if the num is an unsigned "value_list": the name of the enum for enum parameters + "conditional_deps": the list of conditional dependencies for boolean parameters """ configuration_infos = {} configuration_infos["paramlist"] = [] @@ -696,6 +728,14 @@ def loadConfigurationInfos(path): configuration_infos[name]["value"].find("U") != -1): configuration_infos[name]["informations"]["unsigned"] = True configuration_infos[name]["value"] = configuration_infos[name]["value"].replace("U", "") + if "conditional_deps" in configuration_infos[name]["informations"]: + if (type(configuration_infos[name]["informations"]["conditional_deps"]) == str or + type(configuration_infos[name]["informations"]["conditional_deps"]) == unicode): + configuration_infos[name]["informations"]["conditional_deps"] = (configuration_infos[name]["informations"]["conditional_deps"], ) + elif type(configuration_infos[name]["informations"]["conditional_deps"]) == tuple: + pass + else: + configuration_infos[name]["informations"]["conditional_deps"] = () configuration_infos[name]["description"] = description configuration_infos[name]["brief"] = brief return configuration_infos