projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Paste.
[bertos.git]
/
wizard
/
bertos_utils.py
diff --git
a/wizard/bertos_utils.py
b/wizard/bertos_utils.py
index 2520b109cff531be35b6e70308f9a6dc338f65f1..363b08b5e182e5e1f5573aa04ce27336cfff9e8d 100644
(file)
--- a/
wizard/bertos_utils.py
+++ b/
wizard/bertos_utils.py
@@
-87,9
+87,17
@@
def loadBertosProject(project_file):
def setEnabledModules(project_info, enabled_modules):
modules = project_info.info("MODULES")
def setEnabledModules(project_info, enabled_modules):
modules = project_info.info("MODULES")
+ files = {}
for module, information in modules.items():
information["enabled"] = module in enabled_modules
for module, information in modules.items():
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)
+ project_info.setInfo("FILES", files)
def enabledModules(project_info):
enabled_modules = []
def enabledModules(project_info):
enabled_modules = []
@@
-105,7
+113,7
@@
def mergeSources(srcdir, new_sources, old_sources):
# TODO: implement the three way merge algorithm
#
shutil.rmtree(srcdir, True)
# TODO: implement the three way merge algorithm
#
shutil.rmtree(srcdir, True)
- copytree.copytree(
sources_dir + "/bertos"
, srcdir, ignore_list=const.IGNORE_LIST)
+ 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")