X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=3129857e3fa8ffcf46b409209a6d6dd6443fc073;hb=26809a9a1ef3d00c111321a73c62edfc91e3a62b;hp=ca24f6692c8d1b9290bd9ccf479f839bcb07fef3;hpb=e28fc9dfd2361aecf99ecb8f3f256a8776e266d3;p=bertos.git diff --git a/wizard/BProject.py b/wizard/BProject.py index ca24f669..3129857e 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -51,7 +51,7 @@ from bertos_utils import ( isBertosDir, getTagSet, getInfos, updateConfigurationValues, loadConfigurationInfos, loadDefineLists, loadModuleDefinition, getCommentList, sub, - + # Project creation functions projectFileGenerator, versionFileGenerator, makefileGenerator, userMkGenerator, mkGenerator, loadPlugin, mergeSources, @@ -68,7 +68,9 @@ class BProject(object): def __init__(self, project_file="", info_dict={}): self.infos = {} self._cached_queries = {} + self.edit = False if project_file: + self.edit = True self.loadBertosProject(project_file, info_dict) #--- Load methods (methods that loads data into project) ------------------# @@ -80,13 +82,27 @@ 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) + project_src_path = project_data.get("PROJECT_SRC_PATH", None) + project_src_path = os.path.join(project_dir, project_data.get("PROJECT_SRC_PATH", None)) + if project_src_path: + self.infos["PROJECT_SRC_PATH"] = project_src_path + + else: + # In projects created with older versions of the Wizard this metadata doesn't exist + self.infos["PROJECT_SRC_PATH"] = os.path.join(self.infos["PROJECT_PATH"], self.infos["PROJECT_NAME"]) - # Check for the Wizard version wizard_version = project_data.get("WIZARD_VERSION", 0) if wizard_version < 1: - # Ignore the SOURCES_PATH inside the project file for older projects + # Ignore the SOURCES_PATH inside the project file for older project project_data["SOURCES_PATH"] = project_dir + else: + linked_sources_path = project_data["SOURCES_PATH"] + sources_abspath = os.path.abspath(os.path.join(project_dir, linked_sources_path)) + project_data["SOURCES_PATH"] = sources_abspath + self._loadBertosSourceStuff(project_data["SOURCES_PATH"], info_dict.get("SOURCES_PATH", None)) + + self.infos["PRESET"] = project_data.get("PRESET", False) # For those projects that don't have a VERSION file create a dummy one. if not isBertosDir(project_dir): @@ -150,14 +166,27 @@ class BProject(object): self._loadToolchainStuff(project_data["TOOLCHAIN"]) # NOTE: this is a HACK!!! # TODO: find a better way to reuse loadModuleData + preset_project_name = project_data.get("PROJECT_NAME", os.path.basename(preset)) + preset_prj_src_path = os.path.join(preset, project_data.get("PROJECT_SRC_PATH", os.path.join(preset, preset_project_name))) + 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)) + old_project_src_path = self.infos["PROJECT_SRC_PATH"] + + self.infos["PROJECT_NAME"] = preset_project_name self.infos["PROJECT_PATH"] = preset + self.infos["PROJECT_SRC_PATH"] = preset_prj_src_path + self.loadModuleData(True) self.setEnabledModules(project_data["ENABLED_MODULES"]) + self.infos["PROJECT_NAME"] = old_project_name - self.infos["PROJECT_PATH"] = old_project_path + self.infos["PROJECT_PATH"] = old_project_path + self.infos["PROJECT_SRC_PATH"] = old_project_src_path + + self.infos["PRESET_NAME"] = preset_project_name + self.infos["PRESET_PATH"] = preset + self.infos["PRESET_SRC_PATH"] = preset_prj_src_path def loadProjectPresets(self): """ @@ -172,22 +201,22 @@ class BProject(object): 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'] = [] + _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)) + _tree["children"].append(self._loadProjectPresetTree(_path)) # Add into the info dict the dir type (dir/project) - if _tree['children']: - _tree['info']['type'] = 'dir' + if _tree["children"]: + _tree["info"]["type"] = "dir" else: - _tree['info']['type'] = 'project' + _tree["info"]["type"] = "project" return _tree def _loadPresetInfo(self, preset_spec_file): @@ -222,12 +251,11 @@ class BProject(object): raise DefineException.ConfigurationDefineException(self.infos["SOURCES_PATH"] + "/" + configuration, err.line_number, err.line) if edit: try: - path = self.infos["PROJECT_NAME"] - directory = self.infos["PROJECT_PATH"] - user_configuration = loadConfigurationInfos(directory + "/" + configuration.replace("bertos", path)) + path = self.infos["PROJECT_SRC_PATH"] + user_configuration = loadConfigurationInfos(configuration.replace("bertos", path)) configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], user_configuration) except ParseError, err: - raise DefineException.ConfigurationDefineException(directory + "/" + configuration.replace("bertos", path)) + raise DefineException.ConfigurationDefineException(configuration.replace("bertos", path)) module_info_dict.update(module_dict) configuration_info_dict.update(configuration_info) if to_be_parsed: @@ -250,7 +278,7 @@ class BProject(object): 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') + 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): @@ -265,41 +293,83 @@ class BProject(object): #-------------------------------------------------------------------------# - def createBertosProject(self, edit=False): - directory = self.infos["PROJECT_PATH"] - sources_dir = self.infos["SOURCES_PATH"] - old_sources_dir = self.infos.get("OLD_SOURCES_PATH", None) - # Create the destination directory - self._createDestinationDirectory(directory, edit) + def createBertosProject(self): + # NOTE: Temporary hack. + if self.edit: + self._editBertosProject() + else: + if not self.from_preset: + self._newCustomBertosProject() + else: + self._newBertosProjectFromPreset() + + def _newBertosProject(self): + for directory in (self.maindir, self.srcdir, self.prjdir, self.cfgdir): + self._createDirectory(directory) # Write the project file - self._writeProjectFile(directory + "/project.bertos") + self._writeProjectFile(os.path.join(self.maindir, "project.bertos")) # VERSION file - self._writeVersionFile(directory + "/VERSION") - # Destination source dir - self._createSourcesDir(sources_dir, directory + "/bertos", old_sources_dir, edit) + self._writeVersionFile(os.path.join(self.maindir, "VERSION")) # Destination makefile - self._writeMakefile(directory + "/Makefile") - # Destination project dir - # prjdir = directory + "/" + os.path.basename(directory) - prjdir = self._createProjectDir(directory) - # Destination hw files - hwdir = self._createHwFilesDir(prjdir, edit) - # Copy all the hw files - self._writeHwFiles(sources_dir, hwdir, edit) - # Destination configurations files - cfgdir = self._createCfgFilesDir(prjdir, edit) + self._writeMakefile(os.path.join(self.maindir, "Makefile")) + # Copy the sources + self._copySources(self.sources_dir, self.srcdir) # Set properly the autoenabled parameters self._setupAutoenabledParameters() # Copy all the configuration files - self._writeCfgFiles(sources_dir, cfgdir) - if not edit: - # Destination user mk file (only on project creation) - self._writeUserMkFile(os.path.join(prjdir, os.path.basename(prjdir) + ".mk")) + self._writeCfgFiles(self.sources_dir, self.cfgdir) # Destination wizard mk file - self._writeWizardMkFile(prjdir + "/" + os.path.basename(prjdir) + "_wiz.mk") + self._writeWizardMkFile(os.path.join(self.prjdir, os.path.basename(self.prjdir) + "_wiz.mk")) + + def _newCustomBertosProject(self): + # Create/write/copy the common things + self._newBertosProject() + # Copy the clean hw files + self._createDirectory(self.hwdir) + # Copy all the hw files + self._writeHwFiles(self.sources_dir, self.hwdir) + # Destination user mk file + self._writeUserMkFile(os.path.join(self.prjdir, os.path.basename(self.prjdir) + ".mk")) # Destination main.c file - if not edit: - self._writeMainFile(prjdir + "/main.c") + self._writeMainFile(self.prjdir + "/main.c") + # Create project files for selected plugins + self._createProjectFiles() + + def _newBertosProjectFromPreset(self): + # Create/write/copy the common things + self._newBertosProject() + + # Copy all the files and dirs except cfg/hw/*_wiz.mk + self._writeCustomSrcFiles() + + if self.infos["EMPTY_MAIN"]: + # Create and empty main.c file only if the user check the box + self._writeMainFile(self.prjdir + "/main.c") + + # Create project files for selected plugins + self._createProjectFiles() + + def _editBertosProject(self): + # Write the project file + self._writeProjectFile(os.path.join(self.maindir, "project.bertos")) + # VERSION file + self._writeVersionFile(os.path.join(self.maindir, "VERSION")) + # Destination makefile + self._writeMakefile(os.path.join(self.maindir, "Makefile")) + # Merge sources + self._mergeSources(self.sources_dir, self.srcdir, self.old_srcdir) + # Copy all the hw files + self._writeHwFiles(self.sources_dir, self.hwdir) + # Set properly the autoenabled parameters + self._setupAutoenabledParameters() + # Copy all the configuration files + self._writeCfgFiles(self.sources_dir, self.cfgdir) + # Destination wizard mk file + self._writeWizardMkFile(os.path.join(self.prjdir, os.path.basename(self.prjdir) + "_wiz.mk")) + # Create project files for selected plugins + self._createProjectFiles() + + def _createProjectFiles(self): # Files for selected plugins relevants_files = {} for plugin in self.infos["OUTPUT"]: @@ -317,7 +387,7 @@ class BProject(object): f.close() def _writeMakefile(self, filename): - makefile = open(os.path.join(const.DATA_DIR, "mktemplates/Makefile"), 'r').read() + makefile = open(os.path.join(const.DATA_DIR, "mktemplates/Makefile"), "r").read() makefile = makefileGenerator(self, makefile) open(filename, "w").write(makefile) @@ -336,15 +406,15 @@ class BProject(object): main = open(os.path.join(const.DATA_DIR, "srctemplates/main.c"), "r").read() open(filename, "w").write(main) - def _writeHwFiles(self, source_dir, destination_dir, edit=False): + def _writeHwFiles(self, source_dir, destination_dir): for module, information in self.infos["MODULES"].items(): for hwfile in information["hw"]: string = open(source_dir + "/" + hwfile, "r").read() hwfile_path = destination_dir + "/" + os.path.basename(hwfile) - if not edit or not os.path.exists(hwfile_path): + if not self.edit or not os.path.exists(hwfile_path): # If not in editing mode it copies all the hw files. If in # editing mode it copies only the files that don't exist yet - open(destination_dir + "/" + os.path.basename(hwfile), "w").write(string) + open(os.path.join(destination_dir,os.path.basename(hwfile)), "w").write(string) def _writeCfgFiles(self, source_dir, destination_dir): for configuration, information in self.infos["CONFIGURATIONS"].items(): @@ -357,10 +427,28 @@ class BProject(object): if "long" in infos["informations"] and infos["informations"]["long"]: value += "L" string = sub(string, parameter, value) - f = open(destination_dir + "/" + os.path.basename(configuration), "w") + f = open(os.path.join(destination_dir, os.path.basename(configuration)), "w") f.write(string) f.close() + def _writeCustomSrcFiles(self): + origin = self.infos["PRESET_SRC_PATH"] + # Files to be ignored (all project files, cfg dir, wizard mk file, all global ignored dirs) + project_related_stuff = ( + "cfg", + self.infos["PROJECT_NAME"] + "_wiz.mk", + "project.bertos", + self.infos["PROJECT_NAME"] + ".project", + self.infos["PROJECT_NAME"] + ".workspace", + ) + const.IGNORE_LIST + for element in os.listdir(origin): + if element not in project_related_stuff: + full_path = os.path.join(origin, element) + if os.path.isdir(full_path): + copytree.copytree(full_path, os.path.join(self.prjdir, element), ignore_list=const.IGNORE_LIST) + else: + shutil.copy(full_path, self.prjdir) + def _setupAutoenabledParameters(self): for module, information in self.infos["MODULES"].items(): if "configuration" in information and information["configuration"] != "": @@ -371,43 +459,62 @@ class BProject(object): configuration[parameter]["value"] = "1" if information["enabled"] else "0" self.infos["CONFIGURATIONS"] = configurations - def _createSourcesDir(self, sources_dir, dest_srcdir, old_sources_dir, edit=False): - if not edit: - # If not in editing mode it copies all the bertos sources in the /bertos subdirectory of the project - shutil.rmtree(dest_srcdir, True) - copytree.copytree(sources_dir + "/bertos", dest_srcdir, ignore_list=const.IGNORE_LIST) - elif old_sources_dir: - # If in editing mode it merges the current bertos sources with the selected ones - # TODO: implement the three way merge algotihm - # - mergeSources(dest_srcdir, sources_dir, old_sources_dir) - - def _createDestinationDirectory(self, maindir, edit=False): - if not edit: - if os.path.isdir(maindir): - shutil.rmtree(maindir, True) - os.makedirs(maindir) - - def _createProjectDir(self, maindir, edit=False): - prjdir = os.path.join(maindir, self.infos["PROJECT_NAME"]) - if not edit: - shutil.rmtree(prjdir, True) - os.mkdir(prjdir) - return prjdir - - def _createHwFilesDir(self, prjdir, edit=False): - hwdir = prjdir + "/hw" - if not edit: - shutil.rmtree(hwdir, True) - os.mkdir(hwdir) - return hwdir - - def _createCfgFilesDir(self, prjdir, edit=False): - cfgdir = prjdir + "/cfg" - if not edit: - shutil.rmtree(cfgdir, True) - os.mkdir(cfgdir) - return cfgdir + @property + def maindir(self): + return self.infos.get("PROJECT_PATH", None) + + @property + def srcdir(self): + if self.maindir: + return os.path.join(self.maindir, "bertos") + else: + return None + + @property + def prjdir(self): + return self.infos.get("PROJECT_SRC_PATH", None) + + @property + def hwdir(self): + if self.prjdir: + return os.path.join(self.prjdir, "hw") + else: + return None + + @property + def cfgdir(self): + if self.prjdir: + return os.path.join(self.prjdir, "cfg") + else: + return None + + @property + def old_srcdir(self): + return self.infos.get("OLD_SOURCES_PATH", None) + + @property + def sources_dir(self): + return self.infos.get("SOURCES_PATH", None) + + @property + def from_preset(self): + return self.infos.get("PROJECT_FROM_PRESET", False) + + def _createDirectory(self, directory): + if not directory: + return + if os.path.isdir(directory): + shutil.rmtree(directory, True) + os.makedirs(directory) + + def _copySources(self, origin, destination): + # If not in editing mode it copies all the bertos sources in the /bertos subdirectory of the project + shutil.rmtree(destination, True) + copytree.copytree(origin + "/bertos", destination, ignore_list=const.IGNORE_LIST) + + def _mergeSources(self, origin, destination, old_sources_dir): + if old_sources_dir: + mergeSources(destination, origin, old_sources_dir) def setInfo(self, key, value): """ @@ -465,4 +572,4 @@ class BProject(object): self.infos["FILES"] = files def __repr__(self): - return repr(self.infos) + return "%s" %(id(self), repr(self.infos))