run indent on expand_instantiations.cc

Also run clang-format on cmake/scripts/*.cc.

While I am here, add "tests" to remove_trailing_whitespace that was
missing.

diff --git a/cmake/.clang-format b/cmake/.clang-format
deleted file mode 100644 (file)
index 184bb9f..0000000
--- a/cmake/.clang-format
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# The clang-format (Clang 6) style file used by deal.II.
-# This directory shall not be formatted.
-#
-
-DisableFormat: true

diff --git a/contrib/utilities/indent b/contrib/utilities/indent
index 92387a54c5ddf027bf7cc8cf3e137c27501d2377..039619b442746f175c414a3f10bb63bc93d71dc0 100755 (executable)
--- a/contrib/utilities/indent
+++ b/contrib/utilities/indent
@@ -56,22 +56,22 @@ checks
 # Process all source and header files:
 #
 
-process_changed "tests include source examples contrib/python-bindings" ".*\.(cc|h|cu|cuh)" format_file
+process_changed "tests include source examples cmake/scripts contrib/python-bindings" ".*\.(cc|h|cu|cuh)" format_file
 process_changed "source" ".*\.inst.in" format_inst
 
 #
 # Fix permissions and convert to unix line ending if necessary:
 #
 
-process_changed "tests include source examples contrib/python-bindings" \
+process_changed "tests include source examples cmake/scripts contrib/python-bindings" \
   ".*\.(cc|h|cu|cuh|inst.in|output.*|cmake)" fix_permissions
 
-process_changed "tests include source examples contrib/python-bindings" \
+process_changed "tests include source examples cmake/scripts contrib/python-bindings" \
   ".*\.(cc|h|cu|cuh|inst.in|cmake)" dos_to_unix
 
 #
 # Removing trailing whitespace
 #
 
-process_changed "include source examples contrib/python-bindings doc" \
+process_changed "tests include source examples cmake/scripts contrib/python-bindings doc" \
   ".*\.(cc|h|cu|cuh|html|dox|txt)" remove_trailing_whitespace

diff --git a/contrib/utilities/indent-all b/contrib/utilities/indent-all
index b5d5450d91afae72497327242670708c98128c12..efdfdca7b945d8d2998e8343f365cb0eb97fc8ad 100755 (executable)
--- a/contrib/utilities/indent-all
+++ b/contrib/utilities/indent-all
@@ -67,15 +67,15 @@ process "source" ".*\.inst.in" format_inst
 # Fix permissions and convert to unix line ending if necessary:
 #
 
-process "tests include source examples contrib/python-bindings" \
+process "tests include source examples cmake/scripts contrib/python-bindings" \
   ".*\.(cc|h|cu|cuh|inst.in|output.*|cmake)" fix_permissions
 
-process "tests include source examples contrib/python-bindings" \
+process "tests include source examples cmake/scripts contrib/python-bindings" \
   ".*\.(cc|h|cu|cuh|inst.in|cmake)" dos_to_unix
 
 #
 # Removing trailing whitespace
 #
 
-process "include source examples contrib/python-bindings doc" \
+process "tests include source examples cmake/scripts contrib/python-bindings doc" \
   ".*\.(cc|h|cu|cuh|html|dox|txt)" remove_trailing_whitespace