From 546e80a186b01ab65925529d01eb0343113e2ffa Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Wed, 7 Nov 2012 14:29:47 -0800
Subject: [PATCH] Preserve doxygen.warnings.log from last report.

Direct doxygen warnings to doxygen.log.
doxygen.warnings.report.sh moves this to doxygen.warnings.log, so
subsequent normal oxygen builds don't overwrite it.
---
 .hgignore                      |  1 +
 doc/doxygen.conf               |  2 +-
 doc/doxygen.warnings.report.sh | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.hgignore b/.hgignore
index 8005e8788..3b72f761d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -20,6 +20,7 @@
 \.pcap$
 \.mob$
 \.routes$
+^doc/doxygen.log$
 ^doc/doxygen.warnings.log$
 ^doc/(manual|models|tutorial|tutorial-pt-br)/build
 ^doc/(manual|models|tutorial|tutorial-pt-br)/figures/.*\.(eps|pdf|png)$
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 7d3f37861..94e213d8c 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -646,7 +646,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = doc/doxygen.warnings.log
+WARN_LOGFILE           = doc/doxygen.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
diff --git a/doc/doxygen.warnings.report.sh b/doc/doxygen.warnings.report.sh
index 492798323..25cbcf753 100755
--- a/doc/doxygen.warnings.report.sh
+++ b/doc/doxygen.warnings.report.sh
@@ -10,7 +10,7 @@ ROOT=`hg root`
 
 conf=$DIR/doxygen.conf
 
-sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT /s/YES/no/' $conf
+sed -i.bak -E '/^EXTRACT_ALL |^HAVE_DOT |^WARNINGS /s/YES/no/' $conf
 rm -f $conf.bak
 
 echo -n "Rebuilding doxygen docs with full errors..."
@@ -26,16 +26,21 @@ else
     exit 1
 fi
 
+
+# Save the log file
+log=$DIR/doxygen.warnings.log
+
+mv $DIR/doxygen.log $log
+
 # Now we're ready to summarize the log
 
-logfile=$DIR/doxygen.warnings.log
 
 echo
 echo "Summary Report of Doxygen warnings:"
 echo
 echo "Count of warning by module:"
 echo "Count Module"
-grep "^$ROOT" $logfile  | \
+grep "^$ROOT" $log  | \
     cut -d ':' -f 1 | \
     sed "s|$ROOT||g" | \
     cut -d '/' -f 1-3 | \
@@ -46,9 +51,9 @@ grep "^$ROOT" $logfile  | \
 echo 
 
 undocparam=` \
-grep -v "^$ROOT" $logfile | \
+grep -v "^$ROOT" $log | \
     grep -v "not generated, too many nodes" | \
-    grep "^  parameter '" $logfile | \
+    grep "^  parameter '" $log | \
     wc -l | \
     sed 's/^[ \t]*//;s/[ \t]*$//' `