From 26dbdcc2c1a7dd34847aa5bcd3f3a5d87419711a Mon Sep 17 00:00:00 2001 From: Teemu Murtola Date: Wed, 1 Jan 2014 21:33:40 +0200 Subject: [PATCH] Fix copyright check in admin/uncrustify.sh The automatic copyright year check didn't consider files that were also uncrustified. Also removed some extra code (that had no effect) from the script that looks like incorrectly merged or pasted. Also fix incorrect attribute for thread_mpi/CMakeLists.txt. Part of #818. Change-Id: I80ce1b936fa9b77a94eb3dfe8fcff0490a886f42 --- .gitattributes | 1 + admin/uncrustify.sh | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 08e166c36d..af6711a0b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,6 +34,7 @@ src/contrib/* !filter src/gromacs/gmxlib/gpu_utils/memtestG80_core.* !filter src/gromacs/gmxlib/nonbonded/preprocessor/gmxpreprocess.py !filter **/thread_mpi/** filter=uncrustify_only +src/gromacs/gmxlib/thread_mpi/CMakeLists.txt !filter src/gromacs/legacyheaders/thread_mpi.h filter=uncrustify_only src/gromacs/legacyheaders/tmpi.h filter=uncrustify_only src/gromacs/linearalgebra/gmx_blas/* !filter diff --git a/admin/uncrustify.sh b/admin/uncrustify.sh index bd7c83f71a..c683163076 100755 --- a/admin/uncrustify.sh +++ b/admin/uncrustify.sh @@ -2,7 +2,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2013, by the GROMACS development team, led by +# Copyright (c) 2013,2014, by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -202,7 +202,7 @@ cut -f2 <$tmpdir/difflist | \ cut -f2 <$tmpdir/filtered >$tmpdir/filelist_all grep -E '(uncrustify|uncrustify_only)$' <$tmpdir/filtered | \ cut -f2 >$tmpdir/filelist_uncrustify -grep 'copyright$' <$tmpdir/filtered | \ +grep -E '(uncrustify|copyright)$' <$tmpdir/filtered | \ cut -f2 >$tmpdir/filelist_copyright git diff-files --name-only | grep -Ff $tmpdir/filelist_all >$tmpdir/localmods @@ -262,9 +262,6 @@ if [[ $copyright_mode != "off" ]] ; then *) echo "Unknown copyright mode: $copyright_mode" exit 2 - if [[ $copyright -eq 2 ]] ; then - cpscript_args+=" --update-header" - fi esac if [[ $action == check-* ]] ; then cpscript_args+=" --check" -- 2.22.0