projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sam3x-ek: set system clock at 84 MHz
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index a15e5af1fd815fec0063db22016f86cbf2c6d44b..204c4fe4ea1e602f9f61ecbaf5756451dee36b88 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-133,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):
@@
-170,7
+172,7
@@
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["$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])
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])
@@
-185,7
+187,7
@@
def mkGenerator(project_info):
destination = os.path.join(prjdir, os.path.basename(prjdir) + ".mk")
mk_data = {}
mk_data["$pname"] = project_info.info("PROJECT_NAME")
destination = os.path.join(prjdir, os.path.basename(prjdir) + ".mk")
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():
@@
-195,7
+197,7
@@
def mkGenerator(project_info):
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"].rsplit("gcc", 1)[0])
mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].rsplit("gcc", 1)[1])
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"].rsplit("gcc", 1)[0])
mk_data["$suffix"] = replaceSeparators(project_info.info("TOOLCHAIN")["path"].rsplit("gcc", 1)[1])
- mk_data["$hwpath"] =
relpath.relpath(project_info.info("PROJECT_HW_PATH"), project_info.info("PROJECT_PATH")
)
+ 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)
@@
-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):