From: Wolfgang Bangerth Date: Thu, 10 Mar 2016 14:59:58 +0000 (-0600) Subject: Don't generate status output. X-Git-Tag: v8.5.0-rc1~1230^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2329%2Fhead;p=dealii.git Don't generate status output. Also provide an error if we couldn't find the right version of astyle. This didn't matter much before because the tool was always called on the command line, but is important now that it can be called by 'make indent'. --- diff --git a/contrib/utilities/indent b/contrib/utilities/indent index ca5c34f32f..492d3717bd 100755 --- a/contrib/utilities/indent +++ b/contrib/utilities/indent @@ -1,7 +1,7 @@ #!/bin/bash ## --------------------------------------------------------------------- ## -## Copyright (C) 2012 - 2013, 2015 by the deal.II authors +## Copyright (C) 2012 - 2013, 2015, 2016 by the deal.II authors ## ## This file is part of the deal.II library. ## @@ -16,12 +16,12 @@ if test ! -d source -o ! -d include -o ! -d examples ; then echo "*** This script must be run from the top-level directory of deal.II." - exit + exit 1 fi if test ! -f contrib/utilities/astyle.rc ; then echo "*** No style file contrib/utilities/astyle.rc found." - exit + exit 1 fi if test -z "`which astyle`" ; then @@ -30,19 +30,17 @@ if test -z "`which astyle`" ; then echo "*** You can download astyle from http://astyle.sourceforge.net/" echo "*** Note that you will need exactly version 2.04 (no newer or" echo "*** older version will yield the correct indentation)." - exit + exit 1 fi if test "`astyle --version 2>&1`" != "Artistic Style Version 2.04" ; then echo "*** Found a version of astyle different than the required version 2.04." - exit + exit 1 fi # collect all header and source files and process them in batches of 50 files # with up to 10 in parallel -echo "--- Indenting all deal.II header and source files" - find tests include source examples \( -name '*.cc' -o -name '*.h' \) -print | xargs -n 50 -P 10 astyle --options=contrib/utilities/astyle.rc