MANTA-1534 Update formatting scripts

Author: ctsa

scratch/source_check_and_format/clang-format

@@ -1,33 +1,21 @@
 #!/usr/bin/env bash
 #
-# run astyle on all cxx source
+# run clang-format on all cxx source
 #
 
 set -o nounset
 
-scriptName=$(basename $0)
+this_dir=$(dirname $0)
 
-if ! which -a astyle > /dev/null 2>&1 ; then
-    echo "ERROR: Can't find required utility 'astyle' in PATH" 1>&2
-    exit 1;
-fi
+cxx_base_dir=$this_dir/../../src/c++
 
-thisDir=$(dirname $0)
+get_c_and_cpp_files() {
+  find $cxx_base_dir \( -name *.cpp -or -name *.cc -or -name *.c -or -name *.hpp -or -name *.hh -or -name *.h \)
+}
 
-cxx_base_dir=$thisDir/../../src/c++
+# remove windows line endings from source:
+get_c_and_cpp_files | xargs -P8 -n1 sed $'s/\r$//' -i
 
-
-cd $cxx_base_dir 
-astyle \
---style=ansi \
---align-pointer=type \
---max-instatement-indent=80 \
---min-conditional-indent=0 \
---pad-header \
---lineend=linux \
---suffix=none \
---recursive \
-"*.cpp" "*.hh" "*.h" "*.h.in"
-
-#--keep-one-line-blocks \
-#--keep-one-line-statements \
+# general c/c++ source reformatting:
+get_c_and_cpp_files | xargs -P8 -n1 $this_dir/clang-format -style=file -i
+ 

scratch/source_check_and_format/run_cxx_formatter.bash

@@ -0,0 +1,65 @@
+BasedOnStyle: Google
+
+# These are already part of Google style, but explicitly add them here because
+# they're called out in the coding guidelines:
+Standard: Cpp11
+IndentWidth: 2
+UseTab: Never
+
+# Google default of 80 columns is a little tight:
+ColumnLimit: 110
+
+# Protect long string literals already in source:
+BreakStringLiterals: false
+
+# Comment lines that follow these patterns are likely to be commented out code. Don't reflow these.
+#
+# Patterns in this regex are:
+# 1. a line comment (ie. a second one inside of the first comment)
+# 2. preprocessor directive
+# 3. various common code line endings
+CommentPragmas: '(//|^\s*#|(;|:|"|{|}|\(|\)|\[|\]|<|>)\s*$)'
+
+# Indent before the ':'
+ConstructorInitializerIndentWidth: 2
+
+# If false, leave case labels at the same level as the switch:
+IndentCaseLabels: false
+
+# Set the indent for public/protected/private in classes:
+AccessModifierOffset: -2
+
+# Only allow empty functions and inline methods in class headers to go on a single line:
+AllowShortFunctionsOnASingleLine: Inline
+
+# Use one pointer alignment everywhere:
+DerivePointerAlignment: false
+
+# Try to preserve the dominant alignment style
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+
+# Try to preserve the dominant style for function parameters:
+AlignAfterOpenBracket: AlwaysBreak
+BinPackArguments: false
+BinPackParameters: false
+
+# This copies the Google format for brace breaking, except for adding a break after functions
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+