#
# Copyright 2008 Develer S.r.l. (http://www.develer.com/)
#
-# $Id$
#
# Author: Lorenzo Berni <duplo@develer.com>
#
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"]))
+ self.infos["PROJECT_SRC_PATH_FROM_MAKEFILE"] = project_data.get("PROJECT_SRC_PATH_FROM_MAKEFILE")
+ self.infos["PROJECT_HW_PATH_FROM_MAKEFILE"] = project_data.get("PROJECT_HW_PATH_FROM_MAKEFILE")
+
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
toolchain = toolchain
if forced_toolchain:
toolchain = forced_toolchain
- if os.path.exists(toolchain["path"]):
+ if os.path.exists(toolchain["path"]) or bertos_utils.findInPath(toolchain["path"]):
self.infos["TOOLCHAIN"] = toolchain
else:
raise ToolchainException(self)
try:
to_be_parsed, module_dict = loadModuleDefinition(comment_list[0])
except ParseError, err:
- raise DefineException.ModuleDefineException(path, err.line_number, err.line)
+ raise DefineException.ModuleDefineException(os.path.join(path, filename), err.line_number, err.line)
for module, information in module_dict.items():
if "depends" not in information:
information["depends"] = ()
list_dict = loadDefineLists(comment_list[1:])
list_info_dict.update(list_dict)
except ParseError, err:
- raise DefineException.EnumDefineException(path, err.line_number, err.line)
+ raise DefineException.EnumDefineException(os.path.join(path, filename), err.line_number, err.line)
for tag in self.infos["CPU_INFOS"]["CPU_TAGS"]:
for filename, path in self.findDefinitions("*_" + tag + ".h"):
comment_list = getCommentList(open(path + "/" + filename, "r").read())
# 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")
-
# Create project files for selected plugins
self._createProjectFiles()
self._mergeSources(self.bertos_maindir, self.srcdir, self.old_srcdir)
# Copy all the hw files
self._writeHwFiles(self.bertos_srcdir, self.hwdir)
- # Destination wizard mk file
- self._writeWizardMkFile()
+
+ # Destination wizard mk file (it seems that this file need to be
+ # rewritten also if the project is a preset)...
+ self._writeWizardMkFile()
+
# Set properly the autoenabled parameters
self._setupAutoenabledParameters()
# Copy all the configuration files