[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/quality-kde-org] apidox/src: doxylog2html.pl - fixes related to modern doxygen version 1.8
From:       Allen Winter <allen.winter () kdab ! com>
Date:       2014-07-22 13:49:02
Message-ID: E1X9aRC-0003TH-FV () scm ! kde ! org
[Download RAW message or body]

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/a4a19cb361f3786806bd90cdb199617eff83bd19


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


[prev in list] [next in list] [prev in thread] [next in thread]