integrate sorting of includes into astyle.sh/astyle-all.sh/prepare-co…

…mmit.sh
qgis · Jun 10, 2015 · facfe6e · facfe6e · 3nids · Jun 10, 2015
1 parent a6eb0f5
commit facfe6e
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 23 deletions.
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -43,27 +43,29 @@ fi
 
 set -e
 
-export ARTISTIC_STYLE_OPTIONS="\
---preserve-date \
---indent-preprocessor \
---brackets=break \
---convert-tabs \
---indent=spaces=2 \
---indent-classes \
---indent-labels \
---indent-namespaces \
---indent-switches \
---one-line=keep-blocks \
---one-line=keep-statements \
---max-instatement-indent=40 \
---min-conditional-indent=-1 \
---suffix=none"
-
-export ARTISTIC_STYLE_OPTIONS="\
-$ARTISTIC_STYLE_OPTIONS \
---pad=oper \
---pad=paren-in \
---unpad=paren"
+astyleit()
+{
+	scripts/sort_includes.pl "$1"
+
+	$ASTYLE \
+		--preserve-date \
+		--indent-preprocessor \
+		--brackets=break \
+		--convert-tabs \
+		--indent=spaces=2 \
+		--indent-classes \
+		--indent-labels \
+		--indent-namespaces \
+		--indent-switches \
+		--one-line=keep-blocks \
+		--one-line=keep-statements \
+		--max-instatement-indent=40 \
+		--min-conditional-indent=-1 \
+		--suffix=none \
+		--pad=oper \
+		--pad=paren-in \
+		--unpad=paren "$1"
+}
 
 for f in "$@"; do
 	case "$f" in
@@ -73,7 +75,7 @@ for f in "$@"; do
                 ;;
 
         *.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp)
-                cmd="$ASTYLE $ARTISTIC_STYLE_OPTIONS"
+                cmd=astyleit
                 ;;
 
         *.ui|*.qgm|*.txt|*.t2t|resources/context_help/*)

diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
@@ -31,7 +31,7 @@ fi
 
 if [ "$1" = "-c" ]; then
 	echo "Cleaning..."
-	find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" \) -print -delete
+	find . \( -name "*.prepare" -o -name "*.astyle" -o -name "*.nocopyright" -o -name "astyle.*.diff" -o -name "sha-*.diff" -o -name "*.sortinc" \) -print -delete
 fi
 
 set -e

diff --git a/scripts/sort_includes.pl b/scripts/sort_includes.pl
@@ -0,0 +1,56 @@
+#!/usr/bin/perl -i.sortinc -n
+###########################################################################
+#    sort_includes.pl
+#    ---------------------
+#    begin                : June 2015
+#    copyright            : (C) 2015 by Juergen E. Fischer
+#    email                : jef at norbit dot de
+#
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+# adapted from scripts/sort_includes.sh
+
+use strict;
+use warnings;
+
+our %uis;
+our %sys;
+our %others;
+our $sorting;
+
+BEGIN { $sorting = 0; }
+END { die "header files not empty" if keys %uis || keys %sys || keys %others; }
+
+if(/^\s*#include/ ) {
+	if(/"ui_/ ) {
+		$uis{$_}=1;
+	} elsif(/</) {
+		$sys{$_}=1;
+	} else {
+		$others{$_}=1;
+	}
+	$sorting=1;
+	next;
+}
+
+if( $sorting ) {
+	print foreach sort keys %uis;
+	print foreach sort keys %sys;
+	print foreach sort keys %others;
+
+	undef %uis;
+	undef %sys;
+	undef %others;
+}
+
+
+$sorting=0;
+
+print;