projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged revisions 4003-4037 via svnmerge from
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index f10d7dc59fafc11de78f98398a20763a83fed4d6..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")
@@
-163,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)
@@
-229,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"])
@@
-379,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 = {}