From 0b2d4efb356ad8f8401fe483ec66a4d8cd6b6f0a Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Tue, 7 Jul 2020 15:29:27 -0400 Subject: [PATCH] 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. --- cmake/.clang-format | 6 ------ contrib/utilities/indent | 8 ++++---- contrib/utilities/indent-all | 6 +++--- 3 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 cmake/.clang-format diff --git a/cmake/.clang-format b/cmake/.clang-format deleted file mode 100644 index 184bb9fa58..0000000000 --- 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 92387a54c5..039619b442 100755 --- 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 b5d5450d91..efdfdca7b9 100755 --- 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 -- 2.39.5