Copy the user mk file of the preset, replacing the old preset name with the project...

[bertos.git] / wizard / BProject.py

diff --git a/wizard/BProject.py b/wizard/BProject.py
index b3116d70390044b23c6a202e3153f74977bfa96e..a9d285b90ac4522983a367ff99086515e8bd4282 100644 (file)
--- a/wizard/BProject.py
+++ b/wizard/BProject.py
@@ -86,8 +86,7 @@ class BProject(object):
         # 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
             
@@ -340,9 +339,12 @@ class BProject(object):
         # 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")
@@ -396,6 +398,9 @@ class BProject(object):
     def _writeUserMkFile(self):
         bertos_utils.userMkGenerator(self)
 
+    def _writeUserMkFileFromPreset(self):
+        bertos_utils.userMkGeneratorFromPreset(self)
+
     def _writeWizardMkFile(self):
         bertos_utils.mkGenerator(self)
 
@@ -433,7 +438,8 @@ class BProject(object):
         # 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",
+            self.infos["PRESET_NAME"] + ".mk",
+            self.infos["PRESET_NAME"] + "_user.mk",
             "project.bertos",
             self.infos["PRESET_NAME"] + ".project",
             self.infos["PRESET_NAME"] + ".workspace",