Use os.path.normpath for normalize the file paths with native separator

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 1c8caaa74adde5ffb9d37c3f8dda7f1ca648b005..805519419374ac3274744f52ac522e77cd4137b5 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -141,13 +141,13 @@ def csrcGenerator(project_info):
                     asm_files |= set(dependencySFiles)
             for file in module_files:
                 if not harvard or "harvard" not in information or information["harvard"] == "both":
-                    csrc.append(file)
+                    csrc.append(os.path.normpath(file))
                 if harvard and "harvard" in information:
-                    pcsrc.append(file)
+                    pcsrc.append(os.path.normpath(file))
             for file in dependency_files:
-                csrc.append(file)
+                csrc.append(os.path.normpath(file))
             for file in asm_files:
-                asrc.append(file)
+                asrc.append(os.path.normpath(file))
     csrc = " \\\n\t".join(csrc) + " \\"
     pcsrc = " \\\n\t".join(pcsrc) + " \\"
     asrc = " \\\n\t".join(asrc) + " \\"
@@ -398,6 +398,9 @@ def loadModuleData(project):
             except ParseError, err:
                 raise DefineException.ModuleDefineException(path, err.line_number, err.line)
             for module, information in module_dict.items():
+                if "depends" not in information:
+                    information["depends"] = ()
+                information["depends"] += (filename.split(".")[0],)
                 information["category"] = os.path.basename(path)
                 if "configuration" in information.keys() and len(information["configuration"]):
                     configuration = module_dict[module]["configuration"]