getCommentList, sub,
# Project creation functions
- projectFileGenerator, versionFileGenerator, makefileGenerator,
- userMkGenerator, mkGenerator, loadPlugin, mergeSources,
+ projectFileGenerator, versionFileGenerator, loadPlugin,
+ mergeSources,
# Custom exceptions
ParseError, SupportedException
)
+import bertos_utils
+
+from compatibility import updateProject
class BProject(object):
"""
def loadBertosProject(self, project_file, info_dict):
project_dir = os.path.dirname(project_file)
project_data = pickle.loads(open(project_file, "r").read())
+ updateProject(project_data)
# If PROJECT_NAME is not defined it use the directory name as PROJECT_NAME
# 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
# 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"])
- wizard_version = project_data.get("WIZARD_VERSION", 0)
- if wizard_version < 1:
- # Ignore the BERTOS_PATH inside the project file for older project
- project_data["BERTOS_PATH"] = project_dir
- else:
- 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
+ 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.
- if not isBertosDir(project_dir):
+ if not isBertosDir(project_dir) and not self.is_preset:
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()
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))
self.infos["PROJECT_NAME"] = old_project_name
self.infos["PROJECT_PATH"] = old_project_path
self.infos["PROJECT_SRC_PATH"] = old_project_src_path
+ # End of the ugly HACK!
self.infos["PRESET_NAME"] = preset_project_name
self.infos["PRESET_PATH"] = preset
# VERSION file
self._writeVersionFile(os.path.join(self.maindir, "VERSION"))
# Destination makefile
- self._writeMakefile(os.path.join(self.maindir, "Makefile"))
+ self._writeMakefile()
# Copy the sources
self._copySources(self.sources_dir, self.srcdir)
# Set properly the autoenabled parameters
# 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"))
+ self._writeWizardMkFile()
def _newCustomBertosProject(self):
# Create/write/copy the common things
# 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"))
+ self._writeUserMkFile()
# Destination main.c file
self._writeMainFile(self.prjdir + "/main.c")
# Create project files for selected plugins
# 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()
+ # 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
self._writeMainFile(self.prjdir + "/main.c")
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)
+ if not self.is_preset:
+ # Generate this files only if the project isn't a preset
+ # VERSION file
+ self._writeVersionFile(os.path.join(self.maindir, "VERSION"))
+ # Destination makefile
+ self._writeMakefile()
+ # Merge sources
+ self._mergeSources(self.sources_dir, self.srcdir, self.old_srcdir)
+ # Copy all the hw files
+ self._writeHwFiles(self.sources_dir, 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)
- # 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()
+ if not self.is_preset:
+ # Create project files for selected plugins only if the project isn't a preset
+ self._createProjectFiles()
def _createProjectFiles(self):
# Files for selected plugins
f.write(projectFileGenerator(self))
f.close()
- def _writeMakefile(self, filename):
- makefile = open(os.path.join(const.DATA_DIR, "mktemplates/Makefile"), "r").read()
- makefile = makefileGenerator(self, makefile)
- open(filename, "w").write(makefile)
+ def _writeMakefile(self):
+ bertos_utils.makefileGenerator(self)
- def _writeUserMkFile(self, filename):
- makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read()
- # Deadly performances loss was here :(
- makefile = userMkGenerator(self, makefile)
- open(filename, "w").write(makefile)
+ def _writeUserMkFile(self):
+ bertos_utils.userMkGenerator(self)
- def _writeWizardMkFile(self, filename):
- makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template_wiz.mk"), "r").read()
- makefile = mkGenerator(self, makefile)
- open(filename, "w").write(makefile)
+ def _writeUserMkFileFromPreset(self):
+ bertos_utils.userMkGeneratorFromPreset(self)
+
+ def _writeWizardMkFile(self):
+ bertos_utils.mkGenerator(self)
def _writeMainFile(self, filename):
main = open(os.path.join(const.DATA_DIR, "srctemplates/main.c"), "r").read()
# 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",
+ self.infos["PRESET_NAME"] + ".mk",
+ self.infos["PRESET_NAME"] + "_user.mk",
"project.bertos",
- self.infos["PROJECT_NAME"] + ".project",
- self.infos["PROJECT_NAME"] + ".workspace",
+ self.infos["PRESET_NAME"] + ".project",
+ self.infos["PRESET_NAME"] + ".workspace",
) + const.IGNORE_LIST
for element in os.listdir(origin):
if element not in project_related_stuff:
def from_preset(self):
return self.infos.get("PROJECT_FROM_PRESET", False)
+ @property
+ def is_preset(self):
+ return self.infos.get("PRESET", False)
+
def _createDirectory(self, directory):
if not directory:
return
projects / bertos.git / blobdiff