From 114d088bb502c1f7173b7586b1edef59ecb5b2d2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 26 Feb 2017 13:08:50 +0100 Subject: [PATCH 1/4] allow testers.txt to contain comments --- s/preview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/preview b/s/preview index 0c1467627..1607afc55 100755 --- a/s/preview +++ b/s/preview @@ -160,7 +160,7 @@ case "$1" in done if [ $sent -eq 0 ]; then if [ -e ../$factions ]; then - for faction in $(cat ../$factions) ; do + for faction in $(grep -v -E '^#' ../$factions) ; do send $faction done fi From 7a1cebb25977571ccd02e18674f7cc01db3fe708 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 26 Feb 2017 13:10:23 +0100 Subject: [PATCH 2/4] silence the preview-build --- s/preview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s/preview b/s/preview index 1607afc55..40dc2952c 100755 --- a/s/preview +++ b/s/preview @@ -27,7 +27,7 @@ git fetch || abort "failed to update source. do you have local changes?" [ -z $1 ] || git checkout $1 git pull git submodule update -s/build || abort "build failed." +s/build > /dev/null || abort "build failed." } function assert_file() { From f4180638af0bf83b68621245bfe57f681c658ca6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 26 Feb 2017 13:12:47 +0100 Subject: [PATCH 3/4] also silence the git pull command and valgrind --- s/preview | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s/preview b/s/preview index 40dc2952c..68fe6e39f 100755 --- a/s/preview +++ b/s/preview @@ -25,7 +25,7 @@ cd $SOURCE rm -rf crypto tolua git fetch || abort "failed to update source. do you have local changes?" [ -z $1 ] || git checkout $1 -git pull +git pull -q git submodule update s/build > /dev/null || abort "build failed." } @@ -79,7 +79,7 @@ SUPP="$SOURCE/share/debian-7_8.supp" SERVER="$SOURCE/Debug/eressea/eressea" VALGRIND=$(which valgrind) if [ ! -z $VALGRIND ]; then -SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER" +SERVER="$VALGRIND --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER" fi $SERVER -v$verbose -t$turn $SOURCE/scripts/run-turn.lua let turn=$turn+1 From b8d9fae4e446685b2e331036b80540283401f001 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 26 Feb 2017 20:16:22 +0100 Subject: [PATCH 4/4] begin version 3.12 --- src/kernel/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/version.c b/src/kernel/version.c index 633fbf7bf..39f4f30e6 100644 --- a/src/kernel/version.c +++ b/src/kernel/version.c @@ -5,7 +5,7 @@ #ifndef ERESSEA_VERSION /* the version number, if it was not passed to make with -D */ -#define ERESSEA_VERSION "3.11.0" +#define ERESSEA_VERSION "3.12.0" #endif const char *eressea_version(void) {