projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lpc-p2378: add "empty" preset template.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index f3df83d187811530bf06ea4059dd38bf0b465216..e361b3c446ec5ebc212c1d7dee71a68b822ed912 100644
(file)
--- 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
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")
def isBertosDir(directory):
return os.path.exists(directory + "/VERSION")
@@
-114,11
+123,14
@@
def projectFileGenerator(project_info):
if project_info.info("PRESET"):
# For presets save again the BERTOS_PATH into project file
project_data["PRESET"] = True
if project_info.info("PRESET"):
# For presets save again the BERTOS_PATH into project file
project_data["PRESET"] = True
- project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH")
+ 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")
else:
# Use the local BeRTOS version instead of the original one
# project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH")
- project_data["BERTOS_PATH"] =
directory
+ project_data["BERTOS_PATH"] =
"."
project_data["PROJECT_NAME"] = project_info.info("PROJECT_NAME", os.path.basename(directory))
project_src_relpath = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), directory)
project_data["PROJECT_SRC_PATH"] = project_src_relpath
project_data["PROJECT_NAME"] = project_info.info("PROJECT_NAME", os.path.basename(directory))
project_src_relpath = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), directory)
project_data["PROJECT_SRC_PATH"] = project_src_relpath
@@
-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"))
# 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.
except ValueError:
# If the version file hasn't a valid version number assume it's an older
# project.