X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=0fc1b7f7f366d2f1da3186ead4e291c96dbd7a66;hb=e9ccb7d4eec1b5e4d3fc670336828caa52df8056;hp=798a96a9539c2a27eadbdf6de91df59f3840eef4;hpb=106d1edb5fc1984143fa299009ef823bd21ee6c5;p=bertos.git diff --git a/wizard/BProject.py b/wizard/BProject.py index 798a96a9..0fc1b7f7 100644 --- a/wizard/BProject.py +++ b/wizard/BProject.py @@ -93,7 +93,7 @@ class BProject(object): 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"]) - self.infos["HW_PATH"] = os.path.join(self.infos["PROJECT_PATH"], project_data.get("HW_PATH", self.infos["PROJECT_PATH"])) + self.infos["PROJECT_HW_PATH"] = os.path.join(self.infos["PROJECT_PATH"], project_data.get("PROJECT_HW_PATH", self.infos["PROJECT_PATH"])) linked_sources_path = project_data["BERTOS_PATH"] sources_abspath = os.path.abspath(os.path.join(project_dir, linked_sources_path)) @@ -168,15 +168,17 @@ class BProject(object): # 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))) - preset_hw_path = os.path.join(preset, project_data.get("PROJET_HW_DIR", preset)) + preset_prj_hw_path = os.path.join(preset, project_data.get("PROJECT_HW_PATH", preset)) old_project_name = self.infos["PROJECT_NAME"] old_project_path = self.infos["PROJECT_PATH"] old_project_src_path = self.infos["PROJECT_SRC_PATH"] + old_project_hw_path = self.infos["PROJECT_HW_PATH"] self.infos["PROJECT_NAME"] = preset_project_name self.infos["PROJECT_PATH"] = preset self.infos["PROJECT_SRC_PATH"] = preset_prj_src_path + self.infos["PROJECT_HW_PATH"] = preset_prj_hw_path self.loadModuleData(True) self.setEnabledModules(project_data["ENABLED_MODULES"]) @@ -184,12 +186,13 @@ class BProject(object): self.infos["PROJECT_NAME"] = old_project_name self.infos["PROJECT_PATH"] = old_project_path self.infos["PROJECT_SRC_PATH"] = old_project_src_path + self.infos["PROJECT_HW_PATH"] = old_project_hw_path # End of the ugly HACK! self.infos["PRESET_NAME"] = preset_project_name self.infos["PRESET_PATH"] = preset self.infos["PRESET_SRC_PATH"] = preset_prj_src_path - self.infos["PRESET_HW_DIR"] = preset_hw_path + self.infos["PRESET_HW_PATH"] = preset_prj_hw_path def loadProjectPresets(self): """ @@ -246,17 +249,26 @@ class BProject(object): information["depends"] = () information["depends"] += (filename.split(".")[0],) information["category"] = os.path.basename(path) + + # Hack to remove 'bertos/' from the configuration file path. + # + # The new module information format substitute paths like 'bertos/cfg/config_file.h' + # with the relative path into the bertos directory ('cfg/config_file.h') + information["configuration"] = information["configuration"].replace("bertos/", "") + information["hw"] = [hw.replace("bertos/", "") for hw in information["hw"]] + if "configuration" in information and len(information["configuration"]): configuration = module_dict[module]["configuration"] try: - configuration_info[configuration] = loadConfigurationInfos(self.infos["BERTOS_PATH"] + "/" + configuration) + cfg_file_path = os.path.join(self.bertos_srcdir, configuration) + configuration_info[configuration] = loadConfigurationInfos(cfg_file_path) except ParseError, err: raise DefineException.ConfigurationDefineException(self.infos["BERTOS_PATH"] + "/" + configuration, err.line_number, err.line) if edit: try: path = self.infos["PROJECT_SRC_PATH"] - user_configuration = loadConfigurationInfos(configuration.replace("bertos", path)) - configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], user_configuration) + cfg_file_path = os.path.join(path, configuration) + configuration_info[configuration] = updateConfigurationValues(configuration_info[configuration], cfg_file_path) except ParseError, err: raise DefineException.ConfigurationDefineException(configuration.replace("bertos", path)) module_info_dict.update(module_dict) @@ -316,11 +328,11 @@ class BProject(object): # Destination makefile self._writeMakefile() # Copy the sources - self._copySources(self.sources_dir, self.srcdir) + self._copySources(self.bertos_maindir, self.srcdir) # Set properly the autoenabled parameters self._setupAutoenabledParameters() # Copy all the configuration files - self._writeCfgFiles(self.sources_dir, self.cfgdir) + self._writeCfgFiles(self.bertos_srcdir, self.cfgdir) # Destination wizard mk file self._writeWizardMkFile() @@ -330,7 +342,7 @@ class BProject(object): # Copy the clean hw files self._createDirectory(self.hwdir) # Copy all the hw files - self._writeHwFiles(self.sources_dir, self.hwdir) + self._writeHwFiles(self.bertos_srcdir, self.hwdir) # Destination user mk file self._writeUserMkFile() # Destination main.c file @@ -368,15 +380,15 @@ class BProject(object): # Destination makefile self._writeMakefile() # Merge sources - self._mergeSources(self.sources_dir, self.srcdir, self.old_srcdir) + self._mergeSources(self.bertos_maindir, self.srcdir, self.old_srcdir) # Copy all the hw files - self._writeHwFiles(self.sources_dir, self.hwdir) + self._writeHwFiles(self.bertos_srcdir, self.hwdir) # Destination wizard mk file self._writeWizardMkFile() # Set properly the autoenabled parameters self._setupAutoenabledParameters() # Copy all the configuration files - self._writeCfgFiles(self.sources_dir, self.cfgdir) + self._writeCfgFiles(self.bertos_srcdir, self.cfgdir) if not self.is_preset: # Create project files for selected plugins only if the project isn't a preset self._createProjectFiles() @@ -469,6 +481,7 @@ class BProject(object): configuration[parameter]["value"] = "1" if information["enabled"] else "0" self.infos["CONFIGURATIONS"] = configurations + # Project related properties @property def maindir(self): return self.infos.get("PROJECT_PATH", None) @@ -502,16 +515,24 @@ class BProject(object): def old_srcdir(self): return self.infos.get("OLD_BERTOS_PATH", None) + # BeRTOS sources related properties @property - def sources_dir(self): + def bertos_maindir(self): return self.infos.get("BERTOS_PATH", None) + @property + def bertos_srcdir(self): + if self.bertos_maindir: + return os.path.join(self.bertos_maindir, "bertos") + else: + return None + @property def src_hwdir(self): if self.from_preset: - return os.path.join(self.infos["PRESET_PATH"], self.infos["PRESET_HW_DIR"]) + return os.path.join(self.infos["PRESET_PATH"], self.infos["PRESET_HW_PATH"]) else: - return self.sources_dir + return self.bertos_maindir @property def from_preset(self):