From 68a8fe342d8337ec1a86b57920bc7dcf7faf2413 Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Testillano Date: Sun, 17 May 2015 17:21:46 +0200 Subject: [PATCH] Fix pre-commit bug regarding astyle detection. If not installed, all commited files are destroyed (empty content) !! --- example/diameter/launcher/Launcher.cpp | 0 example/diameter/launcher/Launcher.hpp | 0 example/diameter/launcher/MyCommunicator.cpp | 0 example/diameter/launcher/MyCommunicator.hpp | 0 .../diameter/launcher/MyCounterRecorder.cpp | 0 .../diameter/launcher/MyCounterRecorder.hpp | 0 .../launcher/MyCounterRecorderClock.hpp | 0 .../diameter/launcher/MyDiameterEngine.hpp | 0 .../diameter/launcher/MyDiameterEntity.cpp | 0 .../diameter/launcher/MyDiameterEntity.hpp | 0 example/diameter/launcher/MyHandler.cpp | 0 example/diameter/launcher/MyHandler.hpp | 0 example/diameter/launcher/MyLocalServer.cpp | 0 example/diameter/launcher/MyLocalServer.hpp | 0 .../diameter/launcher/ProgrammedAnswers.cpp | 0 .../diameter/launcher/ProgrammedAnswers.hpp | 0 .../deployments/ft-client/pre-start.sh | 2 +- include/anna/config/defines.hpp | 3 +++ scr/git/pre-commit.sh | 21 +++++++++++-------- 19 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 example/diameter/launcher/Launcher.cpp create mode 100644 example/diameter/launcher/Launcher.hpp create mode 100644 example/diameter/launcher/MyCommunicator.cpp create mode 100644 example/diameter/launcher/MyCommunicator.hpp create mode 100644 example/diameter/launcher/MyCounterRecorder.cpp create mode 100644 example/diameter/launcher/MyCounterRecorder.hpp create mode 100644 example/diameter/launcher/MyCounterRecorderClock.hpp create mode 100644 example/diameter/launcher/MyDiameterEngine.hpp create mode 100644 example/diameter/launcher/MyDiameterEntity.cpp create mode 100644 example/diameter/launcher/MyDiameterEntity.hpp create mode 100644 example/diameter/launcher/MyHandler.cpp create mode 100644 example/diameter/launcher/MyHandler.hpp create mode 100644 example/diameter/launcher/MyLocalServer.cpp create mode 100644 example/diameter/launcher/MyLocalServer.hpp create mode 100644 example/diameter/launcher/ProgrammedAnswers.cpp create mode 100644 example/diameter/launcher/ProgrammedAnswers.hpp diff --git a/example/diameter/launcher/Launcher.cpp b/example/diameter/launcher/Launcher.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/Launcher.hpp b/example/diameter/launcher/Launcher.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyCommunicator.cpp b/example/diameter/launcher/MyCommunicator.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyCommunicator.hpp b/example/diameter/launcher/MyCommunicator.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyCounterRecorder.cpp b/example/diameter/launcher/MyCounterRecorder.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyCounterRecorder.hpp b/example/diameter/launcher/MyCounterRecorder.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyCounterRecorderClock.hpp b/example/diameter/launcher/MyCounterRecorderClock.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyDiameterEngine.hpp b/example/diameter/launcher/MyDiameterEngine.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyDiameterEntity.cpp b/example/diameter/launcher/MyDiameterEntity.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyDiameterEntity.hpp b/example/diameter/launcher/MyDiameterEntity.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyHandler.cpp b/example/diameter/launcher/MyHandler.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyHandler.hpp b/example/diameter/launcher/MyHandler.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyLocalServer.cpp b/example/diameter/launcher/MyLocalServer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/MyLocalServer.hpp b/example/diameter/launcher/MyLocalServer.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/ProgrammedAnswers.cpp b/example/diameter/launcher/ProgrammedAnswers.cpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/ProgrammedAnswers.hpp b/example/diameter/launcher/ProgrammedAnswers.hpp new file mode 100644 index 0000000..e69de29 diff --git a/example/diameter/launcher/deployments/ft-client/pre-start.sh b/example/diameter/launcher/deployments/ft-client/pre-start.sh index b1863af..a01d1f0 100755 --- a/example/diameter/launcher/deployments/ft-client/pre-start.sh +++ b/example/diameter/launcher/deployments/ft-client/pre-start.sh @@ -24,7 +24,7 @@ fi # DEFAULTS #[ "$entity_dflt" = "" ] && entity_dflt="192.168.12.11:3868,192.168.12.21:3868" [ "$entity_dflt" = "" ] && entity_dflt="localhost:3868" -[ "$entityServerSessions_dflt" = "" ] && entityServerSessions_dflt=10 +[ "$entityServerSessions_dflt" = "" ] && entityServerSessions_dflt=1 [ "$dictionary_dflt" = "" ] && dictionary_dflt=dictionary.xml diff --git a/include/anna/config/defines.hpp b/include/anna/config/defines.hpp index a8e995b..4bae089 100644 --- a/include/anna/config/defines.hpp +++ b/include/anna/config/defines.hpp @@ -14,6 +14,9 @@ // For cstd0x compatibility we will use stdint.h types instead of std:: ones on cstdint: //#include when C++11 available +#include + + #ifdef ANNA_FILE_LOCATION #undef ANNA_FILE_LOCATION #endif diff --git a/scr/git/pre-commit.sh b/scr/git/pre-commit.sh index 5d1a980..01e85e9 100755 --- a/scr/git/pre-commit.sh +++ b/scr/git/pre-commit.sh @@ -48,10 +48,9 @@ then fi # Astyle -version=`astyle --version 2> /dev/null` -if test "x$version" != "x"; then -echo "SDF3 git pre-receive hook:" -echo "Did not find astyle, please install it before continuing." +which astyle >/dev/null 2>/dev/null +if [ $? -ne 0 ]; then +echo "pre-commit hook: 'astyle' not found, install it before continuing or remove .fix_style to skip astyle processing." exit 1 fi ASTYLE=astyle @@ -60,8 +59,7 @@ case `$ASTYLE --version 2> /dev/null` in Artistic*) ;; default) - echo "SDF3 git pre-commit hook:" - echo "Did not find astyle, please install it before continuing." + echo "pre-commit hook: unsupported astyle version, must be 'Artistic Style Version x.xx'. Install or skip (remove .fix_style)." exit 1 ;; esac @@ -90,13 +88,18 @@ test_style () { file=$1 newfile=${file}.astyled #$ASTYLE ${ASTYLE_PARAMETERS} < $file > $newfile 2>>/dev/null - $ASTYLE -a -f -p -o -O -c -s2 -U -x --mode=c < $file > $newfile 2>>/dev/null + echo "Executing $ASTYLE -a -f -p -o -O -c -s2 -U --mode=c < $file > $newfile" + $ASTYLE -a -f -p -o -O -c -s2 -U --mode=c < $file > $newfile + if [ $? -ne 0 ] ; then + echo "Error in astyle" + exit 1 + fi diff "${file}" "${newfile}" - r=$? - if [ $r != 0 ] ; then + if [ $? -ne 0 ] ; then echo "Code style error in '$file', please fix before commiting." if [ -f "./.fix_style" ]; then echo "Auto-fixing code style..." + cp $file ${file}.orig mv $newfile $file else echo "To autofix, create a hidden file named './.fix_style' on suite root." -- 2.20.1