Fixed|Builder: Interpreting gcc build log output

skyjake · Mar 22, 2014 · ab42d16 · ab42d16
1 parent 508187b
commit ab42d16
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/distrib/logcleanup.py b/distrib/logcleanup.py
@@ -26,25 +26,25 @@ def __init__(self):
         self.location = ''
         self.cached = False
 
-c = 0
+clangMode = False
+
 for ln in lines:
     ln = ln.rstrip()
 
-    c += 1
-
     # What kind of a line do we have?
     found = re.search('[a-z]+\.pro', ln)
     if found:
         print prefix_white(ln) + 'qmake ' + found.group(0)   
         continue
 
-
     #found = re.search('Entering directory.*/(deng/.*)\'', ln)
     #if found:
     #    print '\nBuilding in ' + found.group(1) + '...\n'
     #    continue
+
+    if 'clang' in ln: clangMode = True
 
-    found = re.search('.*(clang|gcc|g++).*/doomsday/(.*/)([A-Za-z_0-9]+\.c[p]*)', ln)
+    found = re.search('.*(clang|gcc|g\+\+).*/doomsday/(.*/)([A-Za-z_0-9]+\.c[p]*)', ln)
     if found:
         mod = Module()
         mod.name = found.group(3)
@@ -70,7 +70,7 @@ def __init__(self):
 for ln in erlines:
     ln = ln.rstrip()
 
-    if current:
+    if current and clangMode:
         if re.match('^[~^ ]+$', ln): 
             current = None
         else:
@@ -82,7 +82,7 @@ def __init__(self):
         qmakeOut.append(found.group(2))
         continue    
 
-    found = re.search('^([a-z0-9_/\.]+/[a-z_0-9]+\.[ch][p]*):[0-9]+', ln, re.IGNORECASE)
+    found = re.search('^([a-z0-9_/\.\-]+/[a-z_0-9]+\.[ch][p]*):[0-9]+', ln, re.IGNORECASE)
     if found:
         grp = re.search('/doomsday/(.*/)([a-z_0-9]+\.[ch][p]*)', found.group(1), re.IGNORECASE)
         if grp:
@@ -160,4 +160,4 @@ def __init__(self):
 #        combined = (name, issue.kind, issue.lineNumber, issue.msg)
 #        if combined not in uniq: uniq.append(combined)
 #    for name, kind, num, msg in uniq:
-#        print name, kind, num, msg
+#        print name, kind, num, msg