getCommentList, sub,
# Project creation functions
- projectFileGenerator, versionFileGenerator, loadPlugin,
+ projectFileGenerator, versionFileGenerator, loadPlugin,
mergeSources,
# Custom exceptions
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"])
linked_sources_path = project_data["BERTOS_PATH"]
sources_abspath = os.path.abspath(os.path.join(project_dir, linked_sources_path))
project_data["BERTOS_PATH"] = sources_abspath
-
+
self._loadBertosSourceStuff(project_data["BERTOS_PATH"], info_dict.get("BERTOS_PATH", None))
-
+
self.infos["PRESET"] = project_data.get("PRESET", False)
# For those projects that don't have a VERSION file create a dummy one.
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
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:
# 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
# Copy all the files and dirs except cfg/hw/*.mk
self._writeCustomSrcFiles()
-
+
# Copy the hw files
self._writeHwFiles(self.src_hwdir, self.hwdir)
# 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 _writeHwFiles(self, source_dir, destination_dir):
for module, information in self.infos["MODULES"].items():
for hwfile in information["hw"]:
+ if hwfile == "":
+ continue
string = open(source_dir + "/" + hwfile, "r").read()
hwfile_path = destination_dir + "/" + os.path.basename(hwfile)
if not self.edit or not os.path.exists(hwfile_path):
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.sources_dir
+ return self.bertos_maindir
@property
def from_preset(self):
projects / bertos.git / blobdiff