X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=e6eda0ce7baffe7d8fa2b94372654676cf05cb31;hb=39c1c5711f7cd8b27348ba8f28fbc06491174df2;hp=d7671e2213722718b9a85d89f7220f1a0a97ef97;hpb=5e36442774e8f4414b4374803689d3d2508eb6bd;p=bertos.git diff --git a/wizard/BProject.py b/wizard/BProject.py index d7671e22..e6eda0ce 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -39,13 +39,16 @@ import copy import pickle import DefineException + +from LoadException import VersionException, ToolchainException + import const from bertos_utils import ( # Utility functions - isBertosDir, getTagSet, setEnabledModules, getInfos, + isBertosDir, getTagSet, getInfos, updateConfigurationValues, loadConfigurationInfos, loadDefineLists, loadModuleDefinition, - getCommentList, updateConfigurationValues, + getCommentList, # Custom exceptions ParseError, SupportedException @@ -62,6 +65,8 @@ class BProject(object): if project_file: self.loadBertosProject(project_file, info_dict) + #--- Load methods (methods that loads data into project) ------------------# + def loadBertosProject(self, project_file, info_dict): project_dir = os.path.dirname(project_file) project_data = pickle.loads(open(project_file, "r").read()) @@ -69,23 +74,37 @@ class BProject(object): # NOTE: this can throw an Exception if the user has changed the directory containing the project self.infos["PROJECT_NAME"] = project_data.get("PROJECT_NAME", os.path.basename(project_dir)) self.infos["PROJECT_PATH"] = os.path.dirname(project_file) + # 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"]): - self.infos["SOURCES_PATH"] = project_data["SOURCES_PATH"] - else: - raise VersionException(self) + if wizard_version < 1: + # Ignore the SOURCES_PATH inside the project file for older projects + project_data["SOURCES_PATH"] = project_dir + self._loadBertosSourceStuff(project_data["SOURCES_PATH"], info_dict.get("SOURCES_PATH", None)) + + # For those projects that don't have a VERSION file create a dummy one. 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()) + self.loadSourceTree() - cpu_name = project_data["CPU_NAME"] + self._loadCpuStuff(project_data["CPU_NAME"], project_data["SELECTED_FREQ"]) + self._loadToolchainStuff(project_data["TOOLCHAIN"], info_dict.get("TOOLCHAIN", None)) + self.infos["OUTPUT"] = project_data["OUTPUT"] + self.loadModuleData(True) + self.setEnabledModules(project_data["ENABLED_MODULES"]) + + def _loadBertosSourceStuff(self, sources_path, forced_version=None): + if forced_version: + sources_path = forced_version + if os.path.exists(sources_path): + self.infos["SOURCES_PATH"] = sources_path + else: + raise VersionException(self) + + def _loadCpuStuff(self, cpu_name, cpu_frequency): self.infos["CPU_NAME"] = cpu_name - cpu_info = self.loadCpuInfos() + cpu_info = self.getCpuInfos() for cpu in cpu_info: if cpu["CPU_NAME"] == cpu_name: self.infos["CPU_INFOS"] = cpu @@ -102,16 +121,73 @@ class BProject(object): else: tag_dict[tag] = False self.infos["ALL_CPU_TAGS"] = tag_dict - if "TOOLCHAIN" in info_dict: - project_data["TOOLCHAIN"] = info_dict["TOOLCHAIN"] - if os.path.exists(project_data["TOOLCHAIN"]["path"]): - self.infos["TOOLCHAIN"] = project_data["TOOLCHAIN"] + self.infos["SELECTED_FREQ"] = cpu_frequency + + def _loadToolchainStuff(self, toolchain, forced_toolchain=None): + toolchain = toolchain + if forced_toolchain: + toolchain = forced_toolchain + if os.path.exists(toolchain["path"]): + self.infos["TOOLCHAIN"] = toolchain else: raise ToolchainException(self) - self.infos["SELECTED_FREQ"] = project_data["SELECTED_FREQ"] - self.infos["OUTPUT"] = project_data["OUTPUT"] + + def loadProjectFromPreset(self, preset): + """ + Load a project from a preset. + NOTE: this is a stub. + """ + project_file = os.path.join(preset, "project.bertos") + project_data = pickle.loads(open(project_file, "r").read()) + self.loadSourceTree() + self._loadCpuStuff(project_data["CPU_NAME"], project_data["SELECTED_FREQ"]) + self._loadToolchainStuff(project_data["TOOLCHAIN"]) + # NOTE: this is a HACK!!! + # TODO: find a better way to reuse loadModuleData + old_project_name = self.infos["PROJECT_NAME"] + old_project_path = self.infos["PROJECT_PATH"] + self.infos["PROJECT_NAME"] = project_data.get("PROJECT_NAME", os.path.basename(preset)) + self.infos["PROJECT_PATH"] = preset self.loadModuleData(True) - setEnabledModules(self, project_data["ENABLED_MODULES"]) + self.setEnabledModules(project_data["ENABLED_MODULES"]) + self.infos["PROJECT_NAME"] = old_project_name + self.infos["PROJECT_PATH"] = old_project_path + + def loadProjectPresets(self): + """ + Load the default presets (into the const.PREDEFINED_BOARDS_DIR). + """ + # NOTE: this method does nothing (for now). + preset_path = os.path.join(self.infos["SOURCES_PATH"], const.PREDEFINED_BOARDS_DIR) + preset_tree = {} + if os.path.exists(preset_path): + preset_tree = self._loadProjectPresetTree(preset_path) + self.infos["PRESET_TREE"] = preset_tree + + def _loadProjectPresetTree(self, path): + _tree = {} + _tree['info'] = self._loadPresetInfo(os.path.join(path, const.PREDEFINED_BOARD_SPEC_FILE)) + _tree['info']['filename'] = os.path.basename(path) + _tree['info']['path'] = path + _tree['children'] = [] + entries = set(os.listdir(path)) + for entry in entries: + _path = os.path.join(path, entry) + if os.path.isdir(_path): + sub_entries = set(os.listdir(_path)) + if const.PREDEFINED_BOARD_SPEC_FILE in sub_entries: + _tree['children'].append(self._loadProjectPresetTree(_path)) + # Add into the info dict the dir type (dir/project) + if _tree['children']: + _tree['info']['type'] = 'dir' + else: + _tree['info']['type'] = 'project' + return _tree + + def _loadPresetInfo(self, preset_spec_file): + D = {} + execfile(preset_spec_file, {}, D) + return D def loadModuleData(self, edit=False): module_info_dict = {} @@ -154,9 +230,6 @@ class BProject(object): list_info_dict.update(list_dict) except ParseError, err: raise DefineException.EnumDefineException(path, err.line_number, err.line) - for filename, path in self.findDefinitions("*_" + self.infos["CPU_INFOS"]["TOOLCHAIN"] + ".h"): - comment_list = getCommentList(open(path + "/" + filename, "r").read()) - list_info_dict.update(loadDefineLists(comment_list)) for tag in self.infos["CPU_INFOS"]["CPU_TAGS"]: for filename, path in self.findDefinitions("*_" + tag + ".h"): comment_list = getCommentList(open(path + "/" + filename, "r").read()) @@ -166,18 +239,25 @@ class BProject(object): self.infos["CONFIGURATIONS"] = configuration_info_dict self.infos["FILES"] = file_dict - def loadCpuInfos(self): - cpuInfos = [] - for definition in self.findDefinitions(const.CPU_DEFINITION): - print definition - cpuInfos.append(getInfos(definition)) - return cpuInfos + def loadSourceTree(self): + """ + Index BeRTOS source and load it in memory. + """ + # Index only the SOURCES_PATH/bertos content + bertos_sources_dir = os.path.join(self.info("SOURCES_PATH"), 'bertos') + file_dict = {} + if os.path.exists(bertos_sources_dir): + for element in os.walk(bertos_sources_dir): + for f in element[2]: + file_dict[f] = file_dict.get(f, []) + [element[0]] + self.infos["FILE_DICT"] = file_dict def reloadCpuInfo(self): - for cpu_info in self.loadCpuInfos(): + for cpu_info in self.getCpuInfos(): if cpu_info["CPU_NAME"] == self.infos["CPU_NAME"]: self.infos["CPU_INFOS"] = cpu_info - print cpu_info + + #-------------------------------------------------------------------------# def setInfo(self, key, value): """ @@ -193,15 +273,11 @@ class BProject(object): return copy.deepcopy(self.infos[key]) return default - def loadSourceTree(self): - # Index only the SOURCES_PATH/bertos content - bertos_sources_dir = os.path.join(self.info("SOURCES_PATH"), 'bertos') - file_dict = {} - if os.path.exists(bertos_sources_dir): - for element in os.walk(bertos_sources_dir): - for f in element[2]: - file_dict[f] = file_dict.get(f, []) + [element[0]] - self.infos["FILE_DICT"] = file_dict + def getCpuInfos(self): + cpuInfos = [] + for definition in self.findDefinitions(const.CPU_DEFINITION): + cpuInfos.append(getInfos(definition)) + return cpuInfos def searchFiles(self, filename): file_dict = self.infos["FILE_DICT"] @@ -226,5 +302,17 @@ class BProject(object): self._cached_queries[self.infos["SOURCES_PATH"]][ftype] = definitions return definitions + def setEnabledModules(self, enabled_modules): + modules = self.infos["MODULES"] + files = {} + for module, information in modules.items(): + information["enabled"] = module in enabled_modules + if information["enabled"]: + for dependency in information["depends"]: + if not dependency in modules: + files[dependency] = files.get(dependency, 0) + 1 + self.infos["MODULES"] = modules + self.infos["FILES"] = files + def __repr__(self): - return repr(self.infos) \ No newline at end of file + return repr(self.infos)