diff --git a/bin/tools/doxyFilter b/bin/tools/doxyFilter
index 2e370383e..061c72e52 100755
--- a/bin/tools/doxyFilter
+++ b/bin/tools/doxyFilter
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/bash
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\/ M anipulation |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
@@ -38,7 +38,15 @@
if [ "$#" -gt 0 ]
then
- filePath=$(echo $1 | sed -e s@^$WM_PROJECT_DIR@../../..@ )
+
+ realFilePath=$(echo $1 | sed -e s@^$WM_PROJECT_DIR@../../..@ )
+ if [ -n "$FOAM_ONLINE_REPO" ]
+ then
+ filePath=$(echo $1 | sed -e s@^$WM_PROJECT_DIR@$FOAM_ONLINE_REPO@ )
+ else
+ filePath=$realFilePath
+ fi
+
# dirName=$(echo "$filePath" | sed -e 's@/[^/]*$@@' )
dirName=${filePath%/[^/]*}
fileName=${filePath##*/}
@@ -57,6 +65,7 @@ then
awk -f $WM_PROJECT_DIR/bin/tools/doxyFilter-table.awk $1 | \
awk -f $awkScript | \
sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \
+ -e s@%realFilePath%@$realFilePath@g \
-e s@%filePath%@$filePath@g \
-e s@%fileName%@$fileName@g \
-e s@%dirName%@$dirName@g
diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed
index 084049a4a..e2aecb8b8 100644
--- a/bin/tools/doxyFilter.sed
+++ b/bin/tools/doxyFilter.sed
@@ -11,7 +11,7 @@
/^License/,/\*\//{
/^License/,\%http://www.gnu.org/licenses%{
s?^License.*?\*\/\
-\/\*! \\file %filePath%\
+\/\*! \\file %realFilePath%\
Original source file %fileName%\
\
\
@@ -64,12 +64,14 @@ s/^ /\\relates /
# =>
# \\class Foam::namespaceName::className
#
-/^Class *$/,/^[^ ]/{
+/^Class *$/{
N
+:loop
/.*:: *$/{
N
-s/Class *\n *\(.*\) *\n *\(.*\) */\\class \1\2/
+s/^ *\(.*\) *\n *\(.*\) */\1\2/
}
+t loop
s/Class *\n *\(.*\) */\\class \1/
}
diff --git a/doc/Doxygen/Allwmake b/doc/Doxygen/Allwmake
index a349ee4fc..227bd01b7 100755
--- a/doc/Doxygen/Allwmake
+++ b/doc/Doxygen/Allwmake
@@ -8,6 +8,39 @@ cd ${0%/*} || exit 1 # Run from this directory
exit 1
}
+usage() {
+ exec 1>&2
+ while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+ cat<
+
+