Git commit a4a19cb361f3786806bd90cdb199617eff83bd19 by Allen Winter.
Committed on 22/07/2014 at 13:48.
Pushed by winterz into branch 'master'.

doxylog2html.pl - fixes related to modern doxygen version 1.8.7

M  +17   -5    apidox/src/doxylog2html.pl

http://commits.kde.org/websites/quality-kde-org/a4a19cb361f3786806bd90cdb19=
9617eff83bd19

diff --git a/apidox/src/doxylog2html.pl b/apidox/src/doxylog2html.pl
index d5447d4..33a2ef9 100755
--- a/apidox/src/doxylog2html.pl
+++ b/apidox/src/doxylog2html.pl
@@ -2,7 +2,7 @@
 =

 ##########################################################################=
#####
 # Converts doxygen log files into pretty HTML for the EBN.                =
    #
-# Copyright (C) 2006-2007,2009-2013 by Allen Winter <winter@kde.org>      =
    #
+# Copyright (C) 2006-2007,2009-2014 by Allen Winter <winter@kde.org>      =
    #
 #                                                                         =
    #
 # This program is free software; you can redistribute it and/or modify    =
    #
 # it under the terms of the GNU General Public License as published by    =
    #
@@ -47,7 +47,7 @@ use HTML::Entities;
 use POSIX qw (strftime strtod);
 =

 my($Prog) =3D 'doxylog2html.pl';
-my($Version) =3D '1.97 + doxygen1.8.1';
+my($Version) =3D '1.98 + doxygen1.8.7';
 =

 my($help) =3D '';
 my($explain) =3D '';
@@ -266,6 +266,12 @@ sub initIssues() {
   $Issues{'MAXDOTNODES'}{'files'} =3D '';
 =

   ###
+  $Issues{'BADNESTING'}{'issue'} =3D 'Check for improper comment nesting';
+  $Issues{'BADNESTING'}{'explain'} =3D 'Reached the end of file while stil=
l in a nested comment.';
+  $Issues{'BADNESTING'}{'count'} =3D 0;
+  $Issues{'BADNESTING'}{'files'} =3D '';
+
+  ###
   $Issues{'GARBAGE'}{'issue'} =3D 'Check for errors of dubious value';
   $Issues{'GARBAGE'}{'explain'} =3D 'Doxygen messages were encountered tha=
t are less than helpful, but may need to be fixed anyway.  Please investiga=
te.';
   $Issues{'GARBAGE'}{'count'} =3D 0;
@@ -338,7 +344,7 @@ sub processFile() {
 	$line =3D~ s+::++;
 	$line =3D~ s,^\w+[Ww]arning:,:,;
 	($fname,$fline) =3D split(":",$line);
-	if ($fname eq "") {
+	if ($fname eq "" || $fname =3D~ m/warning$/) {
 	  my($t1, $t2);
 	  ($t1,$fname,$t2) =3D split("'",$line);
 	}
@@ -348,8 +354,7 @@ sub processFile() {
 	if ($fline) {
 	  ($fline) =3D split(" ",$fline);
 	  ($linenumber,$unparsed) =3D strtod($fline);
-	  $fname =3D~ s+.*/++;
-	  $fname =3D~ s+/mnt/src/kde/++; # basename($fname);
+	  $fname =3D~ s+.*/srv/sources/++; # basename($fname);
 	  $fname =3D~ s+$cms+.+;
 	  if (exists($Issues{$result}{$fname})) {
 	    $Issues{$result}{$fname} .=3D ",$linenumber";
@@ -562,6 +567,10 @@ print "GARBAGE=3D>$line\n";
     if ($line =3D~ m+Consider increasing DOT_GRAPH_MAX_NODES+) {
       return "MAXDOTNODES";
     }
+    if ($line =3D~ m+Nesting level+) {
+      #return "BADNESTING";
+      return "";
+    }
     if ($line =3D~ m+has become obsolete+) {
       return "";
     }
@@ -574,6 +583,9 @@ print "GARBAGE=3D>$line\n";
     if ($line =3D~ m+found more than one \\mainpage comment block+) {
       return "";
     }
+    if ($line =3D~ m+doxygen no longer ships with+) {
+      return "";
+    }
     if ($line =3D~ m+expected whitespace after copybrief command+) {
       return "BADBRIEF";
     }