Remove empty VDir in codelite projects.

[bertos.git] / wizard / plugins / codelite.py

diff --git a/wizard/plugins/codelite.py b/wizard/plugins/codelite.py
index 543cb6d1498a4e9c1d3319e5d49ca0d8611756f3..1789c52048eb5eccaaa04efa567dc1a2fcedf988 100644 (file)
--- a/wizard/plugins/codelite.py
+++ b/wizard/plugins/codelite.py
@@ -63,12 +63,16 @@ def clFiles(file_dict, directory):
     directory as the base folder.
     """
     filelist = []
-    filelist.append("<VirtualDirectory Name=\"%s\">" %os.path.basename(directory))
+    # Do not create an empty VDir.
+    # TODO: this is *really* ugly, but an empty VDir is worse
+    if directory:
+        filelist.append("<VirtualDirectory Name=\"%s\">" %os.path.basename(directory))
     for f in file_dict[directory]["files"]:
         filelist.append("<File Name=\"%s\"/>" %os.path.join(directory, f))
     for d in file_dict[directory]["dirs"]:
         filelist += clFiles(file_dict, os.path.join(directory, d))
-    filelist.append("</VirtualDirectory>")
+    if directory:
+        filelist.append("</VirtualDirectory>")
     return filelist
 
 def findSources(path):
@@ -96,11 +100,17 @@ def codeliteProjectGenerator(project_info):
     """
     template = open("cltemplates/bertos.project", "r").read()
     filelist = "\n".join(clFiles(findSources(project_info.info("PROJECT_PATH")), ""))
+    debugger_path = project_info.info("TOOLCHAIN")["path"].replace("gcc", "gdb")
+    init_script = project_info.info("CPU_INFOS")["GDB_INIT_SCRIPT"]
     while template.find("$filelist") != -1:
         template = template.replace("$filelist", filelist)
     project_name = os.path.basename(project_info.info("PROJECT_PATH"))
     while template.find("$project") != -1:
         template = template.replace("$project", project_name)
+    while template.find("$debuggerpath") != -1:
+        template = template.replace("$debuggerpath", debugger_path)
+    while template.find("$initscript") != -1:
+        template = template.replace("$initscript", init_script)
     return template
 
 def codeliteWorkspaceGenerator(project_info):