From d796a0fc23efc7ecbd48df78046337e6a4d6315b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 24 Sep 2017 22:01:33 +0200 Subject: [PATCH] update licensecheck script to include Apache license --- tests/auto/checklicenseheaders.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/checklicenseheaders.sh b/tests/auto/checklicenseheaders.sh index 4554210c..99305e30 100755 --- a/tests/auto/checklicenseheaders.sh +++ b/tests/auto/checklicenseheaders.sh @@ -1,9 +1,9 @@ -results=`licensecheck -r -c '\.(cpp|h)$' $1 | grep -v "GPL (v2)" | grep -v "GPL (v3)" | grep -v "BSD" | grep -v "GENERATED" | grep -v "LGPL (v2.1 or later)"` +results=`licensecheck -r -c '\.(cpp|h)$' $1 | grep -v "GPL (v2)" | grep -v "GPL (v3)" | grep -v "BSD" | grep -v "GENERATED" | grep -v "LGPL (v2.1 or later)" | grep -v "Apache (v2.0)"` if test -z "$results"; then exit 0 else echo "*** License check failed. Offending files:" - licensecheck -r -c '\.(cpp|h)$' $1 | grep -v "GPL (v2)" | grep -v "GPL (v2)" | grep -v "GPL (v3)" | grep -v "BSD" | grep -v "GENERATED" | grep -v "LGPL (v2.1 or later)" + licensecheck -r -c '\.(cpp|h)$' $1 | grep -v "GPL (v2)" | grep -v "GPL (v2)" | grep -v "GPL (v3)" | grep -v "BSD" | grep -v "GENERATED" | grep -v "LGPL (v2.1 or later)" | grep -v "Apache (v2.0)" exit 1 fi