Prepare commit ensures empty line before doxygen block

nyalldawson · nyalldawson · commit 3b30701780c5 · 2016-11-08T08:52:39.000+10:00
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -65,6 +65,7 @@ astyleit() {
 	modified=$1.unify_includes_modified
 	cp "$1" "$modified"
 	scripts/unify_includes.pl "$modified"
+	scripts/doxygen_space.pl "$modified"
 	diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
 	rm -f "$modified"
 }
diff --git a/scripts/doxygen_space.pl b/scripts/doxygen_space.pl
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -0 -i.sortinc -n
+###########################################################################
+#    doxygen_space.pl
+#    ---------------------
+#    begin                : October 2016
+#    copyright            : (C) 2016 by Nyall Dawson
+#    email                : nyall dot dawson at gmail dot com
+#
+###########################################################################
+#                                                                         #
+#   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
+
+# this is slurped in whole-file mode, as opposed to unify_incudes.pl
+# which slurps in per-line mode
+
+use strict;
+use warnings;
+
+# Space around doxygen start blocks (force blank line before /**)
+s#(?<!\n)(\n\h*\/\*\*(?!\*))#\n$1#g;
+
+print;
diff --git a/scripts/remove_temporary_files.sh b/scripts/remove_temporary_files.sh
@@ -24,6 +24,7 @@ find . \
        -name "*.orig" \
     -o -name "*.prepare" \
     -o -name "*.sortinc" \
+    -o -name "*.unify_includes_modified" \
     -o -name "*.nocopyright" \
     -o -name "astyle*.diff" \
     -o -name "sha-*.diff" \

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ astyleit() {`
`65`	`65`	`modified=$1.unify_includes_modified`
`66`	`66`	`cp "$1" "$modified"`
`67`	`67`	`scripts/unify_includes.pl "$modified"`
	`68`	`+ scripts/doxygen_space.pl "$modified"`
`68`	`69`	`diff "$1" "$modified" >/dev/null \|\| mv "$modified" "$1"`
`69`	`70`	`rm -f "$modified"`
`70`	`71`	`}`