projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comments.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index c29f9c4fb45b0b91c2bb6490941b291fa9585c24..7be67fe10cdfcafb24b897cc4dc0ae8d36c22935 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-28,7
+28,6
@@
#
# Copyright 2008 Develer S.r.l. (http://www.develer.com/)
#
#
# Copyright 2008 Develer S.r.l. (http://www.develer.com/)
#
-# $Id$
#
# Author: Lorenzo Berni <duplo@develer.com>
#
#
# Author: Lorenzo Berni <duplo@develer.com>
#
@@
-119,7
+118,7
@@
def projectFileGenerator(project_info):
for module, information in project_info.info("MODULES").items():
if information["enabled"]:
enabled_modules.append(module)
for module, information in project_info.info("MODULES").items():
if information["enabled"]:
enabled_modules.append(module)
- project_data["ENABLED_MODULES"] =
enabled_modules
+ project_data["ENABLED_MODULES"] =
sorted(enabled_modules)
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
@@
-134,13
+133,15
@@
def projectFileGenerator(project_info):
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
- project_data["TOOLCHAIN"] = project_info.info("TOOLCHAIN")
+ project_data["PROJECT_SRC_PATH_FROM_MAKEFILE"] = project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE")
+ project_data["TOOLCHAIN"] = {'path': project_info.info("TOOLCHAIN")['path']}
project_data["CPU_NAME"] = project_info.info("CPU_NAME")
project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ")
project_data["OUTPUT"] = project_info.info("OUTPUT")
project_data["WIZARD_VERSION"] = WIZARD_VERSION
project_data["PRESET"] = project_info.info("PRESET")
project_data["PROJECT_HW_PATH"] = relpath.relpath(project_info.info("PROJECT_HW_PATH"), directory)
project_data["CPU_NAME"] = project_info.info("CPU_NAME")
project_data["SELECTED_FREQ"] = project_info.info("SELECTED_FREQ")
project_data["OUTPUT"] = project_info.info("OUTPUT")
project_data["WIZARD_VERSION"] = WIZARD_VERSION
project_data["PRESET"] = project_info.info("PRESET")
project_data["PROJECT_HW_PATH"] = relpath.relpath(project_info.info("PROJECT_HW_PATH"), directory)
+ project_data["PROJECT_HW_PATH_FROM_MAKEFILE"] = project_info.info("PROJECT_HW_PATH_FROM_MAKEFILE")
return pickle.dumps(project_data)
def loadPlugin(plugin):
return pickle.dumps(project_data)
def loadPlugin(plugin):
@@
-171,8
+172,8
@@
def userMkGenerator(project_info):
# Deadly performances loss was here :(
mk_data = {}
mk_data["$pname"] = os.path.basename(project_info.info("PROJECT_PATH"))
# Deadly performances loss was here :(
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"] = "/".join(
"$(%s_SRC_PATH)" %project_info.info("PROJECT_NAME"), "main.c"
)
+ mk_data["$ppath"] =
project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE"
)
+ 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)
@@
-182,10
+183,11
@@
def mkGenerator(project_info):
Generates the mk file for the current project.
"""
makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read()
Generates the mk file for the current project.
"""
makefile = open(os.path.join(const.DATA_DIR, "mktemplates/template.mk"), "r").read()
- destination = os.path.join(project_info.prjdir, os.path.basename(project_info.prjdir) + ".mk")
+ prjdir = os.path.abspath(project_info.prjdir)
+ destination = os.path.join(prjdir, os.path.basename(prjdir) + ".mk")
mk_data = {}
mk_data["$pname"] = project_info.info("PROJECT_NAME")
mk_data = {}
mk_data["$pname"] = project_info.info("PROJECT_NAME")
- mk_data["$ppath"] =
relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")
)
+ mk_data["$ppath"] =
project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE"
)
mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ")
cpu_mk_parameters = []
for key, value in project_info.info("CPU_INFOS").items():
mk_data["$cpuclockfreq"] = project_info.info("SELECTED_FREQ")
cpu_mk_parameters = []
for key, value in project_info.info("CPU_INFOS").items():
@@
-193,9
+195,9
@@
def mkGenerator(project_info):
cpu_mk_parameters.append("%s = %s" %(key.replace("MK", mk_data["$pname"]), value))
mk_data["$cpuparameters"] = "\n".join(cpu_mk_parameters)
mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info)
cpu_mk_parameters.append("%s = %s" %(key.replace("MK", mk_data["$pname"]), value))
mk_data["$cpuparameters"] = "\n".join(cpu_mk_parameters)
mk_data["$csrc"], mk_data["$pcsrc"], mk_data["$cppasrc"], mk_data["$cxxsrc"], mk_data["$asrc"], mk_data["$constants"] = csrcGenerator(project_info)
- mk_data["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].
split("gcc"
)[0])
- mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].
split("gcc"
)[1])
- mk_data["$hwpath"] =
relpath.relpath(project_info.info("PROJECT_HW_PATH"), project_info.info("PROJECT_PATH")
)
+ mk_data["$prefix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].
rsplit("gcc", 1
)[0])
+ mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].
rsplit("gcc", 1
)[1])
+ mk_data["$hwpath"] =
project_info.info("PROJECT_HW_PATH_FROM_MAKEFILE"
)
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)
@@
-209,7
+211,7
@@
def makefileGenerator(project_info):
# TODO write a general function that works for both the mk file and the Makefile
mk_data = {}
mk_data["$pname"] = project_info.info("PROJECT_NAME")
# TODO write a general function that works for both the mk file and the Makefile
mk_data = {}
mk_data["$pname"] = project_info.info("PROJECT_NAME")
- mk_data["$ppath"] =
relpath.relpath(project_info.info("PROJECT_SRC_PATH"), project_info.info("PROJECT_PATH")
)
+ mk_data["$ppath"] =
project_info.info("PROJECT_SRC_PATH_FROM_MAKEFILE"
)
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)
@@
-271,17
+273,17
@@
def csrcGenerator(project_info):
cxxsrc.append(file)
for file in project_info.info("CPU_INFOS")["ASRC"]:
asrc.append(file)
cxxsrc.append(file)
for file in project_info.info("CPU_INFOS")["ASRC"]:
asrc.append(file)
- csrc = s
et(csrc
)
+ csrc = s
orted(set(csrc)
)
csrc = " \\\n\t".join(csrc) + " \\"
csrc = " \\\n\t".join(csrc) + " \\"
- pcsrc = s
et(pcsrc
)
+ pcsrc = s
orted(set(pcsrc)
)
pcsrc = " \\\n\t".join(pcsrc) + " \\"
pcsrc = " \\\n\t".join(pcsrc) + " \\"
- cppasrc = s
et(cppasrc
)
+ cppasrc = s
orted(set(cppasrc)
)
cppasrc = " \\\n\t".join(cppasrc) + " \\"
cppasrc = " \\\n\t".join(cppasrc) + " \\"
- cxxsrc = s
et(cxxsrc
)
+ cxxsrc = s
orted(set(cxxsrc)
)
cxxsrc = " \\\n\t".join(cxxsrc) + " \\"
cxxsrc = " \\\n\t".join(cxxsrc) + " \\"
- asrc = s
et(asrc
)
+ asrc = s
orted(set(asrc)
)
asrc = " \\\n\t".join(asrc) + " \\"
asrc = " \\\n\t".join(asrc) + " \\"
- constants = "\n".join([
os.path.basename(project_info.info("PROJECT_PATH")
) + "_" + key + " = " + unicode(value) for key, value in constants.items()])
+ constants = "\n".join([
project_info.info("PROJECT_NAME"
) + "_" + key + " = " + unicode(value) for key, value in constants.items()])
return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants
def findModuleFiles(module, project_info):
return csrc, pcsrc, cppasrc, cxxsrc, asrc, constants
def findModuleFiles(module, project_info):
@@
-338,17
+340,23
@@
def replaceSeparators(path):
def getSystemPath():
path = os.environ["PATH"]
def getSystemPath():
path = os.environ["PATH"]
- if os.name == "nt":
- path = path.split(";")
- else:
- path = path.split(":")
+ path = path.split(os.pathsep)
return path
return path
+def findInPath(file, path=None):
+ if path is None:
+ path = os.environ.get('PATH', '')
+ if type(path) is type(''):
+ path = path.split(os.pathsep)
+ return filter(os.path.exists, map(lambda dir, file=file: os.path.join(dir, file), path))
+
+
def findToolchains(path_list):
toolchains = []
for element in path_list:
for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
def findToolchains(path_list):
toolchains = []
for element in path_list:
for toolchain in glob.glob(element+ "/" + const.GCC_NAME):
- toolchains.append(toolchain)
+ if not os.path.isdir(toolchain):
+ toolchains.append(toolchain)
return list(set(toolchains))
def getToolchainInfo(output):
return list(set(toolchains))
def getToolchainInfo(output):