X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBProject.py;h=b31c3f114fcc6e280d729e789094b918d91c4b6c;hb=b73ab8af789a79c3beebf051f690a9eed4ddacd0;hp=2bdbfe2e001284b8ff4e2dbe9d8f336b6cf86ba8;hpb=e2bac65191c1090815e574a2459cc3546e890f9d;p=bertos.git

diff --git a/wizard/BProject.py b/wizard/BProject.py
index 2bdbfe2e..b31c3f11 100644
--- a/wizard/BProject.py
+++ b/wizard/BProject.py
@@ -199,7 +199,7 @@ class BProject(object):
         """
         # NOTE: this method does nothing (for now).
         preset_path = os.path.join(self.infos["BERTOS_PATH"], const.PREDEFINED_BOARDS_DIR)
-        preset_tree = {}
+        preset_tree = {"children": []}
         if os.path.exists(preset_path):
             preset_tree = self._loadProjectPresetTree(preset_path)
         self.infos["PRESET_TREE"] = preset_tree
@@ -360,7 +360,7 @@ class BProject(object):
         self._writeCustomSrcFiles()
 
         # Copy the hw files
-        self._writeHwFiles(self.src_hwdir, self.hwdir)
+        self._writeAllPresetHwFiles(self.src_hwdir, self.hwdir)
 
         # Copyt the new *_user.mk file
         self._writeUserMkFileFromPreset()
@@ -441,6 +441,20 @@ class BProject(object):
                     # editing mode it copies only the files that don't exist yet
                     open(os.path.join(destination_dir,os.path.basename(hwfile)), "w").write(string)
 
+    def _writeAllPresetHwFiles(self, source_dir, destination_dir):
+        """
+        Copy all but directories contained into the preset hw directory.
+        It's needed because some presets need custom hw files not defined with
+        Wizard directives into modules...
+        """
+        source_dir = os.path.join(source_dir, "hw")
+        for f in os.listdir(source_dir):
+            abspath = os.path.join(source_dir, f)
+            if not os.path.isdir(abspath):
+                # Exlude directories from the copy!
+                hw_file = open(os.path.join(source_dir, f), 'r').read()
+                open(os.path.join(destination_dir, f), 'w').write(hw_file)
+
     def _writeCfgFiles(self, source_dir, destination_dir):
         for configuration, information in self.infos["CONFIGURATIONS"].items():
             string = open(source_dir + "/" + configuration, "r").read()