X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fbertos_utils.py;h=e361b3c446ec5ebc212c1d7dee71a68b822ed912;hb=30e2d1dd4de05196b9d9f1268732cca50573f700;hp=1aeaef7a78c0c29bb74fae1095a735b90b532141;hpb=a05e3ae271c1aa5c30241e95c6d5e12801ef1f8d;p=bertos.git

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 1aeaef7a..e361b3c4 100644
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -51,6 +51,15 @@ from _wizard_version import WIZARD_VERSION
 
 from LoadException import VersionException, ToolchainException
 
+def _cmp(x, y):
+    result = cmp(x["info"].get('ord', 0), y["info"].get('ord', 0))
+    if result == 0:
+        result = cmp(
+            x["info"].get("name", x["info"]["filename"]).lower(),
+            y["info"].get("name", y["info"]["filename"]).lower()
+        )
+    return result
+
 def isBertosDir(directory):
    return os.path.exists(directory + "/VERSION")
 
@@ -115,6 +124,9 @@ def projectFileGenerator(project_info):
         # For presets save again the BERTOS_PATH into project file
         project_data["PRESET"] = True
         project_data["BERTOS_PATH"] = relpath.relpath(project_info.info("BERTOS_PATH"), directory)
+    elif project_info.edit:
+        # If in editing mode the BERTOS_PATH is maintained
+        project_data["BERTOS_PATH"] = relpath.relpath(project_info.info("BERTOS_PATH"), directory)
     else:
         # Use the local BeRTOS version instead of the original one
         # project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH")
@@ -294,7 +306,7 @@ def findModuleFiles(module, project_info):
     # TODO: split me in a method/function
     try:
         version_string = bertosVersion(project_info.info("BERTOS_PATH"))
-        version_list = [int(i) for i in version_string.split()[-1].split('.')]
+        version_list = [int(i) for i in version_string.split()[1].split('.')]
     except ValueError:
         # If the version file hasn't a valid version number assume it's an older
         # project.