summaryrefslogtreecommitdiff
path: root/merge-helpers
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-24 15:33:04 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-24 15:33:04 +0000
commitfc6caa7714d83e222e1cfcf9fa9f5874b5a0c4b3 (patch)
treed7d6308164d1eeaa5b44a3cb3671b95e4ff51276 /merge-helpers
parent187d42733f4d85c669e1a7193e6fe81971f49cd4 (diff)
2011-01-24 Joel Sherrill <joel.sherrill@oarcorp.com>
* check_bsp: Fix copyright check to allow Copyright.
Diffstat (limited to 'merge-helpers')
-rw-r--r--merge-helpers/ChangeLog4
-rwxr-xr-xmerge-helpers/check_bsp15
2 files changed, 17 insertions, 2 deletions
diff --git a/merge-helpers/ChangeLog b/merge-helpers/ChangeLog
index ab27aaf..daa1bc1 100644
--- a/merge-helpers/ChangeLog
+++ b/merge-helpers/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-24 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * check_bsp: Fix copyright check to allow Copyright.
+
2011-01-17 Joel Sherrill <joel.sherrilL@OARcorp.com>
* check_bsp: Report copyright being NOT present.
diff --git a/merge-helpers/check_bsp b/merge-helpers/check_bsp
index bcc0bfa..0d34c9b 100755
--- a/merge-helpers/check_bsp
+++ b/merge-helpers/check_bsp
@@ -41,6 +41,18 @@ test_its_there()
}
+test_its_there_all_case()
+{
+ if [ $# -ne 2 ] ; then
+ echo Usage: $0 FILE pattern
+ fi
+ grep -i ${2} ${1} >/dev/null
+ if [ $? -ne 0 ] ; then
+ echo "${2} is NOT in ${bspdir}/${1} - case independent check"
+ fi
+
+}
+
test_its_NOT_there_all_case()
{
if [ $# -lt 2 ] ; then
@@ -106,12 +118,11 @@ do
fi
done
-# We want CVS Id strings everywhere possible
# really need to make the copyright strings consistent in BSPs
echo "=== Checking for copyright notices"
find_source | while read f
do
- test_its_there ${f} COPYRIGHT
+ test_its_there_all_case ${f} COPYRIGHT
done
# We want CVS Id strings everywhere possible