projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stack alineament on new process.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index f67da76a2b2dcb0e14cdd3a25f5fc050c360b90d..363b08b5e182e5e1f5573aa04ce27336cfff9e8d 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-82,15
+82,38
@@
def loadBertosProject(project_file):
tag_dict[tag] = False
project_info.setInfo("ALL_CPU_TAGS", tag_dict)
loadModuleData(project_info, True)
tag_dict[tag] = False
project_info.setInfo("ALL_CPU_TAGS", tag_dict)
loadModuleData(project_info, True)
+ setEnabledModules(project_info, project_data["ENABLED_MODULES"])
+ return project_info
+
+def setEnabledModules(project_info, enabled_modules):
modules = project_info.info("MODULES")
modules = project_info.info("MODULES")
+ files = {}
for module, information in modules.items():
for module, information in modules.items():
- information["enabled"] = module in project_data["ENABLED_MODULES"]
+ information["enabled"] = module in enabled_modules
+ for dependency in information["depends"]:
+ if not dependency in modules:
+ if dependency in files:
+ files[dependency] += 1
+ else:
+ files[dependency] = 1
project_info.setInfo("MODULES", modules)
project_info.setInfo("MODULES", modules)
- return project_info
+ project_info.setInfo("FILES", files)
+
+def enabledModules(project_info):
+ enabled_modules = []
+ for name, module in project_info.info("MODULES").items():
+ if module["enabled"]:
+ enabled_modules.append(name)
+ return enabled_modules
def mergeSources(srcdir, new_sources, old_sources):
def mergeSources(srcdir, new_sources, old_sources):
+ # The current mergeSources function provide only a raw copy of the sources in the
+ # created project.
+ #
# TODO: implement the three way merge algorithm
# TODO: implement the three way merge algorithm
- pass
+ #
+ shutil.rmtree(srcdir, True)
+ copytree.copytree(os.path.join(new_sources, "bertos"), srcdir, ignore_list=const.IGNORE_LIST)
def projectFileGenerator(project_info):
directory = project_info.info("PROJECT_PATH")
def projectFileGenerator(project_info):
directory = project_info.info("PROJECT_PATH")
@@
-110,6
+133,7
@@
def projectFileGenerator(project_info):
def createBertosProject(project_info, edit=False):
directory = project_info.info("PROJECT_PATH")
sources_dir = project_info.info("SOURCES_PATH")
def createBertosProject(project_info, edit=False):
directory = project_info.info("PROJECT_PATH")
sources_dir = project_info.info("SOURCES_PATH")
+ old_sources_dir = project_info.info("OLD_SOURCES_PATH")
if not edit:
if os.path.isdir(directory):
shutil.rmtree(directory, True)
if not edit:
if os.path.isdir(directory):
shutil.rmtree(directory, True)
@@
-124,13
+148,11
@@
def createBertosProject(project_info, edit=False):
# If not in editing mode it copies all the bertos sources in the /bertos subdirectory of the project
shutil.rmtree(srcdir, True)
copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
# If not in editing mode it copies all the bertos sources in the /bertos subdirectory of the project
shutil.rmtree(srcdir, True)
copytree.copytree(sources_dir + "/bertos", srcdir, ignore_list=const.IGNORE_LIST)
- el
se
:
+ el
if old_sources_dir
:
# If in editing mode it merges the current bertos sources with the selected ones
# TODO: implement the three way merge algotihm
#
# If in editing mode it merges the current bertos sources with the selected ones
# TODO: implement the three way merge algotihm
#
- # mergeSources(srcdir, sources_dir, old_sources_dir)
- #
- pass
+ mergeSources(srcdir, sources_dir, old_sources_dir)
# Destination makefile
makefile = directory + "/Makefile"
makefile = open("mktemplates/Makefile").read()
# Destination makefile
makefile = directory + "/Makefile"
makefile = open("mktemplates/Makefile").read()
@@
-675,7
+697,8
@@
def loadConfigurationInfos(path):
def updateConfigurationValues(def_conf, user_conf):
for param in def_conf["paramlist"]:
def updateConfigurationValues(def_conf, user_conf):
for param in def_conf["paramlist"]:
- def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
+ if param[1] in user_conf and "value" in user_conf[param[1]]:
+ def_conf[param[1]]["value"] = user_conf[param[1]]["value"]
return def_conf
def findParameterType(parameter):
return def_conf
def findParameterType(parameter):