diff --git a/bin/doxyFilt b/bin/tools/doxyFilter similarity index 89% rename from bin/doxyFilt rename to bin/tools/doxyFilter index 7f337e539c5d6dc56e531b16e70bdd7fa23adf77..c49851a502c18160d27156874977045b7ee24531 100755 --- a/bin/doxyFilt +++ b/bin/tools/doxyFilter @@ -23,7 +23,7 @@ # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # # Script -# doxyFilt +# doxyFilter # # Description # pass-through filter for doxygen @@ -43,19 +43,19 @@ then dirName=${filePath%/[^/]*} fileName=${filePath##*/} - awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilt.awk + awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilter.awk case "$1" in */applications/solvers/*.C | */applications/utilities/*.C ) - awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilt-top.awk + awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilter-top.awk ;; # */applications/solvers/*.H | */applications/utilities/*.H ) -# awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilt-ignore.awk +# awkScript=$WM_PROJECT_DIR/bin/tools/doxyFilter-ignore.awk # ;; esac awk -f $awkScript $1 | \ - sed -f $WM_PROJECT_DIR/bin/tools/doxyFilt.sed \ + sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \ -e s@%filePath%@$filePath@g \ -e s@%fileName%@$fileName@g \ -e s@%dirName%@$dirName@g diff --git a/bin/tools/doxyFilt-ignore.awk b/bin/tools/doxyFilter-ignore.awk similarity index 98% rename from bin/tools/doxyFilt-ignore.awk rename to bin/tools/doxyFilter-ignore.awk index ebbacc7177a5840e05b5324e209aa33dcacd9cea..0d85702b34e907eb6f5ba961077e62cc79107e5d 100644 --- a/bin/tools/doxyFilt-ignore.awk +++ b/bin/tools/doxyFilter-ignore.awk @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # # Script -# doxyFilt-ignore.awk +# doxyFilter-ignore.awk # # Description # - Prefix file contents with doxygen @file tag and %filePath% tag diff --git a/bin/tools/doxyFilt-top.awk b/bin/tools/doxyFilter-top.awk similarity index 98% rename from bin/tools/doxyFilt-top.awk rename to bin/tools/doxyFilter-top.awk index 97b96ff7b46133db1823cf94f53c607cfcbd7752..856e6621d4b4275d7d4817c5821b3c56d639ec1d 100644 --- a/bin/tools/doxyFilt-top.awk +++ b/bin/tools/doxyFilter-top.awk @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # # Script -# doxyFilt-top.awk +# doxyFilter-top.awk # # Description # Only output the first /* ... */ comment section found in the file diff --git a/bin/tools/doxyFilt.awk b/bin/tools/doxyFilter.awk similarity index 99% rename from bin/tools/doxyFilt.awk rename to bin/tools/doxyFilter.awk index da65c3ded70bc070fbbf2df11978963937ba847b..1e37d0e33b46ea92c51d00d80e1ca3c2503bf98b 100644 --- a/bin/tools/doxyFilt.awk +++ b/bin/tools/doxyFilter.awk @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # # Script -# doxyFilt.awk +# doxyFilter.awk # # Description # Converts cocoon style sentinel strings into doxygen style strings diff --git a/bin/tools/doxyFilt.sed b/bin/tools/doxyFilter.sed similarity index 99% rename from bin/tools/doxyFilt.sed rename to bin/tools/doxyFilter.sed index 4aaa7adb0e59a09eb0cf78ea04dcb0914d98ddb4..45a15019e132f41d41b84452bd47e5c46528debc 100644 --- a/bin/tools/doxyFilt.sed +++ b/bin/tools/doxyFilter.sed @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------------- # Script -# doxyFilt.sed +# doxyFilter.sed # # Description # Transform human-readable tags such as 'Description' into the Doxygen diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile index 68ff8430b205ad285cfc0e03936441425d305b3c..79bc3b71cf63254707d46d8c7b5221b48e177ebf 100644 --- a/doc/Doxygen/Doxyfile +++ b/doc/Doxygen/Doxyfile @@ -567,7 +567,7 @@ IMAGE_PATH = # to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = doxyFilt +INPUT_FILTER = $(WM_PROJECT_DIR)/bin/tools/doxyFilter # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 1b1f98598fc3317b734a46a5d5ca16b585b855fa..1445ad0bc21bfe9eff1be2e6f5fdf04eef92b5ce 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -669,7 +669,7 @@ IMAGE_PATH = # If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = doxyFilt +INPUT_FILTER = $(WM_PROJECT_DIR)/bin/tools/doxyFilter # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis.