summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xenv.bash2
-rwxr-xr-xsbe/test/citest/check-copyright3
-rwxr-xr-xsbe/test/citest/copyright-check.sh3
-rwxr-xr-xsbe/tools/hooks/addCopyright (renamed from sbe/build/tools/hooks/addCopyright)2
-rwxr-xr-xsbe/tools/hooks/gerrit-hostname (renamed from sbe/build/tools/hooks/gerrit-hostname)3
-rwxr-xr-xsbe/tools/hooks/post-commit (renamed from sbe/build/tools/hooks/post-commit)3
-rwxr-xr-xsbe/tools/hooks/pre-commit (renamed from sbe/build/tools/hooks/pre-commit)3
-rwxr-xr-xsbe/tools/hooks/pre-commit-actions (renamed from sbe/build/tools/hooks/pre-commit-actions)3
-rwxr-xr-xsbe/tools/hooks/pre-commit-prologs (renamed from sbe/build/tools/hooks/pre-commit-prologs)3
-rwxr-xr-xsbe/tools/hooks/setupgithooks.sh (renamed from sbe/build/tools/hooks/setupgithooks.sh)3
-rwxr-xr-xsbe/tools/hooks/verify-commit (renamed from sbe/build/tools/hooks/verify-commit)3
11 files changed, 13 insertions, 18 deletions
diff --git a/env.bash b/env.bash
index 19a34a12..5c9778b5 100755
--- a/env.bash
+++ b/env.bash
@@ -42,7 +42,7 @@ export DEFAULT_MACHINE=nimbus
# The following ENV variables are required by the pre/post commit hooks
export PROJECT_NAME=sbe
-export TOOLSDIR=$SBEROOT/sbe/build/tools/hooks
+export TOOLSDIR=$SBEROOT/sbe/tools/hooks
export HOOKSDIR=$SBEROOT/.git/hooks
export IMPORT_REL_PATH=import
export IMPORT_DIR=$SBEROOT/$IMPORT_REL_PATH
diff --git a/sbe/test/citest/check-copyright b/sbe/test/citest/check-copyright
index 31c8c2a6..68e536d4 100755
--- a/sbe/test/citest/check-copyright
+++ b/sbe/test/citest/check-copyright
@@ -7,6 +7,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +25,7 @@
# IBM_PROLOG_END_TAG
COPYRIGHT_CHECK=${SBEROOT}/sbe/test/citest/copyright-check.sh
-COMMIT_CHECK=${SBEROOT}/sbe/test/tools/hooks/verify-commit
+COMMIT_CHECK=${SBEROOT}/sbe/tools/hooks/verify-commit
$COPYRIGHT_CHECK || exit -1
$COMMIT_CHECK || exit -1
diff --git a/sbe/test/citest/copyright-check.sh b/sbe/test/citest/copyright-check.sh
index 674bab94..c5c9534d 100755
--- a/sbe/test/citest/copyright-check.sh
+++ b/sbe/test/citest/copyright-check.sh
@@ -7,6 +7,7 @@
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
+# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +30,7 @@
#
export WORKSPACE_DIR=`pwd`
-export ADDCOPYRIGHT=${WORKSPACE_DIR}/sbe/build/tools/hooks/addCopyright
+export ADDCOPYRIGHT=${WORKSPACE_DIR}/sbe/tools/hooks/addCopyright
## run git show to get a list of checked in files
CHECKINFILES=`git show --pretty=format: --name-only -n1 | tr '\n' ' '`
diff --git a/sbe/build/tools/hooks/addCopyright b/sbe/tools/hooks/addCopyright
index 4cc6e33a..13867e7e 100755
--- a/sbe/build/tools/hooks/addCopyright
+++ b/sbe/tools/hooks/addCopyright
@@ -2,7 +2,7 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/addCopyright.pl $
+# $Source: sbe/tools/hooks/addCopyright.pl $
#
# OpenPOWER sbe Project
#
diff --git a/sbe/build/tools/hooks/gerrit-hostname b/sbe/tools/hooks/gerrit-hostname
index 5299a014..4676f04e 100755
--- a/sbe/build/tools/hooks/gerrit-hostname
+++ b/sbe/tools/hooks/gerrit-hostname
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/gerrit-hostname $
+# $Source: sbe/tools/hooks/gerrit-hostname $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/post-commit b/sbe/tools/hooks/post-commit
index a993cd78..d2476f21 100755
--- a/sbe/build/tools/hooks/post-commit
+++ b/sbe/tools/hooks/post-commit
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/post-commit $
+# $Source: sbe/tools/hooks/post-commit $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/pre-commit b/sbe/tools/hooks/pre-commit
index 9cdc7b7c..3cccf64f 100755
--- a/sbe/build/tools/hooks/pre-commit
+++ b/sbe/tools/hooks/pre-commit
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/pre-commit $
+# $Source: sbe/tools/hooks/pre-commit $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/pre-commit-actions b/sbe/tools/hooks/pre-commit-actions
index 3e941ad9..b1c1ecfd 100755
--- a/sbe/build/tools/hooks/pre-commit-actions
+++ b/sbe/tools/hooks/pre-commit-actions
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/pre-commit-actions $
+# $Source: sbe/tools/hooks/pre-commit-actions $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/pre-commit-prologs b/sbe/tools/hooks/pre-commit-prologs
index 2dc19f41..8d8245f1 100755
--- a/sbe/build/tools/hooks/pre-commit-prologs
+++ b/sbe/tools/hooks/pre-commit-prologs
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/pre-commit-prologs $
+# $Source: sbe/tools/hooks/pre-commit-prologs $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/setupgithooks.sh b/sbe/tools/hooks/setupgithooks.sh
index b85300a9..10d6a44f 100755
--- a/sbe/build/tools/hooks/setupgithooks.sh
+++ b/sbe/tools/hooks/setupgithooks.sh
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/setupgithooks.sh $
+# $Source: sbe/tools/hooks/setupgithooks.sh $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/tools/hooks/verify-commit b/sbe/tools/hooks/verify-commit
index 97226453..8f54439f 100755
--- a/sbe/build/tools/hooks/verify-commit
+++ b/sbe/tools/hooks/verify-commit
@@ -2,12 +2,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
-# $Source: sbe/build/tools/hooks/verify-commit $
+# $Source: sbe/tools/hooks/verify-commit $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
OpenPOWER on IntegriCloud