From: Sandro Santilli <strk@kbt.io>
Date: Wed, 28 Feb 2018 22:07:33 +0000 (+0000)
Subject: Have astyle.sh use same indenting as requested by editorconfig
X-Git-Tag: 2.5.0alpha~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26711c9802e1d906b4b8deecac4fb7cfac324b84;p=postgis

Have astyle.sh use same indenting as requested by editorconfig

git-svn-id: http://svn.osgeo.org/postgis/trunk@16436 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/astyle.sh b/astyle.sh
index 3f0997068..2e0aa4c11 100755
--- a/astyle.sh
+++ b/astyle.sh
@@ -20,8 +20,24 @@ fi
 # Find all "pure" C files in the codebase
 #   - not .in.c used for .sql generation
 #   - not lex.yy.c or wktparse.tab.c as these are generated files
-CFILES=`find . -name '*.c' -not \( -name '*_parse.c' -o -name '*_lex.c' \)`
+#   - not topology/* files
+CFILES_TAB=`find . -name '*.c' -not \( \
+  -name '*_parse.c' -o \
+  -name '*_lex.c' -o \
+  -name './topology/*' -o \
+  -name './liblwgeom/liblwgeom_topo.*' \
+\)`
 
 # Run the standard format on the files, and do not
 # leave .orig files around for altered files.
-astyle --style=ansi --indent=tab --suffix=none $CFILES
+astyle --style=ansi --indent=tab --suffix=none $CFILES_TAB
+
+# Find all "pure" C files in the codebase
+#   - not .in.c used for .sql generation
+#   - not lex.yy.c or wktparse.tab.c as these are generated files
+#   - not topology/* files
+CFILES_SPACE="liblwgeom/*.c topology/*.c"
+
+# Run the standard format on the files, and do not
+# leave .orig files around for altered files.
+astyle --style=ansi --indent=space --suffix=none $CFILES_SPACE