# 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))
+ project_src_path = os.path.join(project_dir, project_data.get("PROJECT_SRC_PATH", project_data["PROJECT_NAME"]))
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"])
+ 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))
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
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_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"])
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_PATH"] = preset_prj_hw_path
def loadProjectPresets(self):
"""
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)
+ raise DefineException.ConfigurationDefineException(cfg_file_path, 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], loadConfigurationInfos(cfg_file_path))
except ParseError, err:
- raise DefineException.ConfigurationDefineException(configuration.replace("bertos", path))
+ raise DefineException.ConfigurationDefineException(cfg_file_path, err.line_number, err.line)
module_info_dict.update(module_dict)
configuration_info_dict.update(configuration_info)
if to_be_parsed:
self._newBertosProjectFromPreset()
def _newBertosProject(self):
- for directory in (self.maindir, self.srcdir, self.prjdir, self.cfgdir):
+ for directory in (self.maindir, self.srcdir, self.prjdir, self.cfgdir, self.hwdir):
self._createDirectory(directory)
# Write the project file
self._writeProjectFile(os.path.join(self.maindir, "project.bertos"))
# 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()
# 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
# Create/write/copy the common things
self._newBertosProject()
- # Copy all the files and dirs except cfg/hw/*_wiz.mk
+ # Copy all the files and dirs except cfg/hw/*.mk
self._writeCustomSrcFiles()
+
+ # Copy the hw files
+ self._writeHwFiles(self.src_hwdir, self.hwdir)
+
+ # Copyt the new *_user.mk file
+ self._writeUserMkFileFromPreset()
if self.infos["EMPTY_MAIN"]:
# Create and empty main.c file only if the user check the box
# 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()
self.infos["RELEVANT_FILES"] = relevants_files
def _writeVersionFile(self, filename):
- version_file = open(os.path.join(const.DATA_DIR, "vtemplates/VERSION"), "r").read()
- open(filename, "w").write(versionFileGenerator(self, version_file))
+ if not self.edit or self.old_srcdir:
+ version_file = open(os.path.join(const.DATA_DIR, "vtemplates/VERSION"), "r").read()
+ open(filename, "w").write(versionFileGenerator(self, version_file))
def _writeProjectFile(self, filename):
f = open(filename, "w")
def _writeUserMkFile(self):
bertos_utils.userMkGenerator(self)
+ def _writeUserMkFileFromPreset(self):
+ bertos_utils.userMkGeneratorFromPreset(self)
+
def _writeWizardMkFile(self):
bertos_utils.mkGenerator(self)
# Files to be ignored (all project files, cfg dir, wizard mk file, all global ignored dirs)
project_related_stuff = (
"cfg",
- self.infos["PRESET_NAME"] + "_wiz.mk",
+ "hw",
+ self.infos["PRESET_NAME"] + ".mk",
+ self.infos["PRESET_NAME"] + "_user.mk",
"project.bertos",
self.infos["PRESET_NAME"] + ".project",
self.infos["PRESET_NAME"] + ".workspace",
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)
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_PATH"])
+ else:
+ return self.bertos_maindir
+
@property
def from_preset(self):
return self.infos.get("PROJECT_FROM_PRESET", False)
projects / bertos.git / blobdiff