From 0f57f4ec8a05c08ac2772090e97c61c435655198 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 11 Aug 2010 11:03:43 +0200
Subject: [PATCH] STYLE: move bin/doxyFilt -> bin/tools/doxyFilter
- normally only for doxygen generation, not needed in the path
---
bin/{doxyFilt => tools/doxyFilter} | 10 +++++-----
.../{doxyFilt-ignore.awk => doxyFilter-ignore.awk} | 2 +-
bin/tools/{doxyFilt-top.awk => doxyFilter-top.awk} | 2 +-
bin/tools/{doxyFilt.awk => doxyFilter.awk} | 2 +-
bin/tools/{doxyFilt.sed => doxyFilter.sed} | 2 +-
doc/Doxygen/Doxyfile | 2 +-
doc/doxygen/Doxyfile | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
rename bin/{doxyFilt => tools/doxyFilter} (89%)
rename bin/tools/{doxyFilt-ignore.awk => doxyFilter-ignore.awk} (98%)
rename bin/tools/{doxyFilt-top.awk => doxyFilter-top.awk} (98%)
rename bin/tools/{doxyFilt.awk => doxyFilter.awk} (99%)
rename bin/tools/{doxyFilt.sed => doxyFilter.sed} (99%)
diff --git a/bin/doxyFilt b/bin/tools/doxyFilter
similarity index 89%
rename from bin/doxyFilt
rename to bin/tools/doxyFilter
index 7f337e539c5..c49851a502c 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 ebbacc7177a..0d85702b34e 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 97b96ff7b46..856e6621d4b 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 da65c3ded70..1e37d0e33b4 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 4aaa7adb0e5..45a15019e13 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 68ff8430b20..79bc3b71cf6 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 1b1f98598fc..1445ad0bc21 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.
--
GitLab