X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fplugins%2Fcodelite.py;h=398a90d5ad9330bcd0fad5c2f3ee690ccb65da92;hb=8fb6ea934eedc5b0b976cb80752f2c0237bef864;hp=c5e7007d704337d8554107ef03b73736302b98ae;hpb=cdb972b91ee72e11426735691f8c0e7e8e75b2c0;p=bertos.git

diff --git a/wizard/plugins/codelite.py b/wizard/plugins/codelite.py
index c5e7007d..398a90d5 100644
--- 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):
@@ -83,7 +87,8 @@ def findSources(path):
         if root.find("svn") == -1:
             file_dict[root.replace(path, "")] = {"dirs": [], "files": []}
             for dir in dirs:
-                if dir.find("svn") == -1:
+                # TODO: place the directory name in a constant file.
+                if dir.find("svn") == -1 and dir != "images" and dir != "obj":
                     file_dict[root.replace(path, "")]["dirs"].append(dir)
             for file in files:
                 if file.endswith(const.EXTENSION_FILTER):
@@ -97,6 +102,7 @@ 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"))
@@ -104,6 +110,8 @@ def codeliteProjectGenerator(project_info):
         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):