X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=191aad32f3643ef722ca67c4e044d49c0511bf0f;hb=f1cbaba7fccdbfefe6fbcbc9ee2c2d343b69d1c9;hp=5d3edd6900b8ea1aabdf1b34fae233649bb1568d;hpb=9d095960f0b45a04bb86878834bdfbb032aa41eb;p=bertos.git diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 5d3edd69..191aad32 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -4,7 +4,7 @@ # Copyright 2008 Develer S.r.l. (http://www.develer.com/) # All rights reserved. # -# $Id:$ +# $Id$ # # Author: Lorenzo Berni # @@ -14,10 +14,12 @@ import fnmatch import glob import re import shutil +# Use custom copytree function +import copytree import pickle import const -from plugins import codelite_project +from plugins import codelite import DefineException def isBertosDir(directory): @@ -37,7 +39,7 @@ def createBertosProject(project_info): # Destination source dir srcdir = directory + "/bertos" shutil.rmtree(srcdir, True) - shutil.copytree(sources_dir + "/bertos", srcdir) + copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST) # Destination makefile makefile = directory + "/Makefile" if os.path.exists(makefile): @@ -49,20 +51,37 @@ def createBertosProject(project_info): prjdir = directory + "/" + os.path.basename(directory) shutil.rmtree(prjdir, True) os.mkdir(prjdir) + # Destination hw files + hwdir = prjdir + "/hw" + 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) # Destination configurations files cfgdir = prjdir + "/cfg" shutil.rmtree(cfgdir, True) os.mkdir(cfgdir) + # Set to 1 the autoenabled for enabled modules + for module, information in project_info.info("MODULES").items(): + if information["enabled"] and "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] and configuration[parameter]["type"] == "autoenabled": + configuration[parameter]["value"] = "1" + project_info.setInfo("CONFIGURATIONS", configurations) + # Copy all the configuration files for configuration, information in project_info.info("CONFIGURATIONS").items(): string = open(sources_dir + "/" + configuration, "r").read() for start, parameter in information["paramlist"]: infos = information[parameter] value = infos["value"] - if "type" in infos["informations"] and infos["informations"]["type"] == "autoenabled": - value = "1" - if "unsigned" in infos["informations"].keys() and infos["informations"]["unsigned"]: + if "unsigned" in infos["informations"] and infos["informations"]["unsigned"]: value += "U" - if "long" in infos["informations"].keys() and infos["informations"]["long"]: + if "long" in infos["informations"] and infos["informations"]["long"]: value += "L" string = sub(string, parameter, value) f = open(cfgdir + "/" + os.path.basename(configuration), "w") @@ -77,7 +96,7 @@ def createBertosProject(project_info): open(prjdir + "/main.c", "w").write(main) # Codelite project files if "codelite" in project_info.info("OUTPUT"): - codelite_project.createProject(project_info) + codelite.createProject(project_info) def mkGenerator(project_info, makefile): """ @@ -87,6 +106,7 @@ def mkGenerator(project_info, makefile): mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH")) mk_data["$cpuflag"] = project_info.info("CPU_INFOS")["CPU_FLAG_NAME"] mk_data["$cpuname"] = project_info.info("CPU_INFOS")["CORE_CPU"] + mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ") mk_data["$cflags"] = " ".join(project_info.info("CPU_INFOS")["C_FLAGS"]) mk_data["$ldflags"] = " ".join(project_info.info("CPU_INFOS")["LD_FLAGS"]) mk_data["$cppflags"] = " ".join(project_info.info("CPU_INFOS")["CPP_FLAGS"]) @@ -95,8 +115,8 @@ def mkGenerator(project_info, makefile): mk_data["$asflags"] = " ".join(project_info.info("CPU_INFOS")["AS_FLAGS"]) mk_data["$arflags"] = " ".join(project_info.info("CPU_INFOS")["AR_FLAGS"]) mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info) - mk_data["$prefix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[0] - mk_data["$suffix"] = project_info.info("TOOLCHAIN")["path"].split("gcc")[1] + 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" for key in mk_data: while makefile.find(key) != -1: @@ -136,19 +156,23 @@ def csrcGenerator(project_info): dependency_files = set([]) # assembly sources asm_files = set([]) + hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw" if information["enabled"]: if "constants" in information: constants.update(information["constants"]) cfiles, sfiles = findModuleFiles(module, project_info) module_files |= set(cfiles) asm_files |= set(sfiles) + 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: dependencyCFiles, dependencySFiles = findModuleFiles(file_dependency, project_info) dependency_files |= set(dependencyCFiles) asm_files |= set(dependencySFiles) for file in module_files: - if not harvard or "harvard" not in information or information["harvard"] == "both": + if not harvard or information.get("harvard", "both") == "both": csrc.append(file) if harvard and "harvard" in information: pcsrc.append(file) @@ -182,8 +206,7 @@ def findModuleFiles(module, project_info): for filename, path in findDefinitions(module + ".c", project_info) + \ findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".c", project_info): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") - if os.sep != "/": - path = replaceSeparators(path) + 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) + \ @@ -191,8 +214,7 @@ def findModuleFiles(module, project_info): findDefinitions(module + ".S", project_info) + \ findDefinitions(module + "_" + project_info.info("CPU_INFOS")["TOOLCHAIN"] + ".S", project_info): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") - if os.sep != "/": - path = replaceSeparators(path) + 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"]: @@ -204,8 +226,7 @@ def findModuleFiles(module, project_info): for filename, path in findDefinitions(module + "_" + tag + ".s", project_info) + \ findDefinitions(module + "_" + tag + ".S", project_info): path = path.replace(project_info.info("SOURCES_PATH") + os.sep, "") - if os.sep != "/": - path = replaceSeparators(path) + path = replaceSeparators(path) sfiles.append(path + "/" + filename) return cfiles, sfiles @@ -213,8 +234,9 @@ def replaceSeparators(path): """ Replace the separators in the given path with unix standard separator. """ - while path.find(os.sep) != -1: - path = path.replace(os.sep, "/") + if os.sep != "/": + while path.find(os.sep) != -1: + path = path.replace(os.sep, "/") return path def getSystemPath(): @@ -277,6 +299,16 @@ def loadCpuInfos(project): cpuInfos.append(getInfos(definition)) return cpuInfos +def getTagSet(cpu_info): + tag_set = set([]) + for cpu in cpu_info: + tag_set |= set([cpu["CPU_NAME"]]) + tag_set |= set(cpu["CPU_TAGS"]) + tag_set |= set([cpu["CORE_CPU"]]) + tag_set |= set([cpu["TOOLCHAIN"]]) + return tag_set + + def getInfos(definition): D = {} D.update(const.CPU_DEF) @@ -308,34 +340,64 @@ def loadModuleDefinition(first_comment): elif line.find("\\brief") != -1: module_definition["module_description"] = line[line.find("\\brief") + len("\\brief "):] module_dict = {} - if "module_name" in module_definition.keys(): + if "module_name" in module_definition: module_name = module_definition[const.MODULE_DEFINITION["module_name"]] del module_definition[const.MODULE_DEFINITION["module_name"]] module_dict[module_name] = {} - if const.MODULE_DEFINITION["module_depends"] in module_definition.keys(): - if type(module_definition[const.MODULE_DEFINITION["module_depends"]]) == str: - module_definition[const.MODULE_DEFINITION["module_depends"]] = (module_definition[const.MODULE_DEFINITION["module_depends"]],) - module_dict[module_name]["depends"] = module_definition[const.MODULE_DEFINITION["module_depends"]] + if const.MODULE_DEFINITION["module_depends"] in module_definition: + depends = module_definition[const.MODULE_DEFINITION["module_depends"]] del module_definition[const.MODULE_DEFINITION["module_depends"]] + if type(depends) == str: + depends = (depends,) + module_dict[module_name]["depends"] = depends else: module_dict[module_name]["depends"] = () - if const.MODULE_DEFINITION["module_configuration"] in module_definition.keys(): + if const.MODULE_DEFINITION["module_configuration"] in module_definition: module_dict[module_name]["configuration"] = module_definition[const.MODULE_DEFINITION["module_configuration"]] del module_definition[const.MODULE_DEFINITION["module_configuration"]] else: module_dict[module_name]["configuration"] = "" - if "module_description" in module_definition.keys(): + if "module_description" in module_definition: module_dict[module_name]["description"] = module_definition["module_description"] del module_definition["module_description"] - if const.MODULE_DEFINITION["module_harvard"] in module_definition.keys(): + if const.MODULE_DEFINITION["module_harvard"] in module_definition: harvard = module_definition[const.MODULE_DEFINITION["module_harvard"]] if harvard == "both" or harvard == "pgm_memory": module_dict[module_name]["harvard"] = harvard del module_definition[const.MODULE_DEFINITION["module_harvard"]] + if const.MODULE_DEFINITION["module_hw"] in module_definition: + hw = module_definition[const.MODULE_DEFINITION["module_hw"]] + del module_definition[const.MODULE_DEFINITION["module_hw"]] + if type(hw) == str: + hw = (hw, ) + module_dict[module_name]["hw"] = hw + else: + module_dict[module_name]["hw"] = () + if const.MODULE_DEFINITION["module_supports"] in module_definition: + supports = module_definition[const.MODULE_DEFINITION["module_supports"]] + del module_definition[const.MODULE_DEFINITION["module_supports"]] + module_dict[module_name]["supports"] = supports module_dict[module_name]["constants"] = module_definition module_dict[module_name]["enabled"] = False return to_be_parsed, module_dict +def isSupported(project, module=None, property_id=None): + if not module and property_id: + item = project.info("CONFIGURATIONS")[property_id[0]][property_id[1]]["informations"] + else: + item = project.info("MODULES")[module] + tag_dict = project.info("ALL_CPU_TAGS") + if "supports" in item: + support_string = item["supports"] + supported = {} + try: + exec "supported = " + support_string in tag_dict, supported + except: + raise SupportedException(support_string) + return supported["supported"] + else: + return True + def loadDefineLists(comment_list): define_list = {} for comment in comment_list: @@ -421,7 +483,7 @@ def loadModuleData(project): information["depends"] = () information["depends"] += (filename.split(".")[0],) information["category"] = os.path.basename(path) - if "configuration" in information.keys() and len(information["configuration"]): + if "configuration" in information and len(information["configuration"]): configuration = module_dict[module]["configuration"] try: configuration_info[configuration] = loadConfigurationInfos(project.info("SOURCES_PATH") + "/" + configuration) @@ -480,12 +542,12 @@ def loadConfigurationInfos(path): configuration_infos[name]["informations"] = informations if not "type" in configuration_infos[name]["informations"]: configuration_infos[name]["informations"]["type"] = findParameterType(configuration_infos[name]) - if ("type" in configuration_infos[name]["informations"].keys() and + if ("type" in configuration_infos[name]["informations"] and configuration_infos[name]["informations"]["type"] == "int" and configuration_infos[name]["value"].find("L") != -1): configuration_infos[name]["informations"]["long"] = True configuration_infos[name]["value"] = configuration_infos[name]["value"].replace("L", "") - if ("type" in configuration_infos[name]["informations"].keys() and + if ("type" in configuration_infos[name]["informations"] and configuration_infos[name]["informations"]["type"] == "int" and configuration_infos[name]["value"].find("U") != -1): configuration_infos[name]["informations"]["unsigned"] = True @@ -510,7 +572,7 @@ def isInt(informations): """ Return True if the value is a simple int. """ - if ("long" not in informatios.keys() or not informations["long"]) and ("unsigned" not in informations.keys() or informations["unsigned"]): + if ("long" not in informatios or not informations["long"]) and ("unsigned" not in informations or informations["unsigned"]): return True else: return False @@ -519,7 +581,7 @@ def isLong(informations): """ Return True if the value is a long. """ - if "long" in informations.keys() and informations["long"] and "unsigned" not in informations.keys(): + if "long" in informations and informations["long"] and "unsigned" not in informations: return True else: return False @@ -528,7 +590,7 @@ def isUnsigned(informations): """ Return True if the value is an unsigned. """ - if "unsigned" in informations.keys() and informations["unsigned"] and "long" not in informations.keys(): + if "unsigned" in informations and informations["unsigned"] and "long" not in informations: return True else: return False @@ -537,7 +599,7 @@ def isUnsignedLong(informations): """ Return True if the value is an unsigned long. """ - if "unsigned" in informations.keys() and "long" in informations.keys() and informations["unsigned"] and informations["long"]: + if "unsigned" in informations and "long" in informations and informations["unsigned"] and informations["long"]: return True else: return False @@ -547,3 +609,8 @@ class ParseError(Exception): Exception.__init__(self) self.line_number = line_number self.line = line + +class SupportedException(Exception): + def __init__(self, support_string): + Exception.__init__(self) + self.support_string = support_string \ No newline at end of file