summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBuildTools/Git/Hooks/pre-commit1
-rw-r--r--BuildTools/SCons/SConstruct6
2 files changed, 7 insertions, 0 deletions
diff --git a/BuildTools/Git/Hooks/pre-commit b/BuildTools/Git/Hooks/pre-commit
index 1e3e941..8130ad6 100755
--- a/BuildTools/Git/Hooks/pre-commit
+++ b/BuildTools/Git/Hooks/pre-commit
@@ -10,3 +10,4 @@ echo "Checking copyrights ..."
if ! BuildTools/Copyrighter.py check-all-copyrights; then
echo "Copyright error found. Aborting commit."
exit -1
+fi
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 3f441cb..577536f 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -352,6 +352,12 @@ elif env.get("bonjour", False) :
bonjour_conf.Finish()
################################################################################
+# Set up git hooks
+################################################################################
+
+env.Install("#/.git/hooks", Glob("#/BuildTools/Git/Hooks/*"))
+
+################################################################################
# Project files
# FIXME: We need to explicitly list the order of libraries here, because of
# the exported FLAGS. We should put FLAGS in separate SConscript files, and