projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add first stub of a generic block device interface.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index 1aeaef7a78c0c29bb74fae1095a735b90b532141..dffa2ab843094373b291494513d751418adc4363 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")
@@
-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)
# 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")
else:
# Use the local BeRTOS version instead of the original one
# project_data["BERTOS_PATH"] = project_info.info("BERTOS_PATH")
@@
-160,7
+172,7
@@
def userMkGenerator(project_info):
mk_data = {}
mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH"))
mk_data = {}
mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
mk_data["$ppath"] = relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH"))
- mk_data["$main"] =
os.path.join("$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c"
)
+ mk_data["$main"] =
"/".join(["$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c"]
)
for key in mk_data:
makefile = makefile.replace(key, mk_data[key])
open(destination, "w").write(makefile)
for key in mk_data:
makefile = makefile.replace(key, mk_data[key])
open(destination, "w").write(makefile)
@@
-226,7
+238,7
@@
def csrcGenerator(project_info):
dependency_files = set([])
# assembly sources
asm_files = set([])
dependency_files = set([])
# assembly sources
asm_files = set([])
- hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw"
+ hwdir = os.path.basename(project_info.info("PROJECT_PATH")) + "/hw"
if information["enabled"]:
if "constants" in information:
constants.update(information["constants"])
if information["enabled"]:
if "constants" in information:
constants.update(information["constants"])
@@
-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.
@@
-376,7
+388,7
@@
def getTagSet(cpu_info):
tag_set |= set(cpu["CPU_TAGS"])
tag_set |= set([cpu["TOOLCHAIN"]])
return tag_set
tag_set |= set(cpu["CPU_TAGS"])
tag_set |= set([cpu["TOOLCHAIN"]])
return tag_set
-
+
def getInfos(definition):
D = {}
def getInfos(definition):
D = {}