Fix compiler version report in ci scripts.

28 files changed, 35 insertions, 2 deletions

diff --git a/tools/ci/jobs/clang3.sh b/tools/ci/jobs/clang3.sh
index ef5c57542..65fbb3ece 100755
--- a/tools/ci/jobs/clang3.sh
+++ b/tools/ci/jobs/clang3.sh
@@ -11,6 +11,7 @@ aptget_install clang libc++-dev \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/clang34.sh b/tools/ci/jobs/clang34.sh
index 35d0ac129..7ae75d3b4 100755
--- a/tools/ci/jobs/clang34.sh
+++ b/tools/ci/jobs/clang34.sh
@@ -13,6 +13,7 @@ aptget_install clang-3.4 libc++-dev \
 
 export CXXFLAGS="-stdlib=libc++"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/clang35.sh b/tools/ci/jobs/clang35.sh
index 2d0d47ced..9c8a1b79a 100755
--- a/tools/ci/jobs/clang35.sh
+++ b/tools/ci/jobs/clang35.sh
@@ -13,6 +13,7 @@ aptget_install clang-3.5 libc++-dev \
 
 export CXXFLAGS="-stdlib=libc++"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh
index 7907202f4..46b35a5b7 100755
--- a/tools/ci/jobs/clang39.sh
+++ b/tools/ci/jobs/clang39.sh
@@ -20,6 +20,7 @@ export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversio
 -Wno-variadic-macros -Wno-unreachable-code-return -Wno-double-promotion \
 -Wno-old-style-cast"
 
+do_init
 run_configure $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh
index d3ae58abe..6fdd78b19 100755
--- a/tools/ci/jobs/clang39_sdl2.sh
+++ b/tools/ci/jobs/clang39_sdl2.sh
@@ -20,6 +20,7 @@ export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversio
 -Wno-variadic-macros -Wno-unreachable-code-return -Wno-double-promotion \
 -Wno-old-style-cast"
 
+do_init
 run_configure --with-sdl2 $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/cmake_gcc49.sh b/tools/ci/jobs/cmake_gcc49.sh
index 359c9f5f8..4d2716ab5 100755
--- a/tools/ci/jobs/cmake_gcc49.sh
+++ b/tools/ci/jobs/cmake_gcc49.sh
@@ -11,6 +11,7 @@ aptget_install gcc-4.9 g++-4.9 \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
 run_cmake
 run_make
 
diff --git a/tools/ci/jobs/gcc44.sh b/tools/ci/jobs/gcc44.sh
index 7406cc0ad..c2ea9ee8a 100755
--- a/tools/ci/jobs/gcc44.sh
+++ b/tools/ci/jobs/gcc44.sh
@@ -11,6 +11,7 @@ aptget_install gcc-4.4 g++-4.4 \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh
index ea13e1e23..874acca94 100755
--- a/tools/ci/jobs/gcc46.sh
+++ b/tools/ci/jobs/gcc46.sh
@@ -11,6 +11,7 @@ aptget_install gcc-4.6 g++-4.6 \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc47.sh b/tools/ci/jobs/gcc47.sh
index 34ab2fd59..f23058459 100755
--- a/tools/ci/jobs/gcc47.sh
+++ b/tools/ci/jobs/gcc47.sh
@@ -11,6 +11,7 @@ aptget_install gcc-4.7 g++-4.7 \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc48_c++11.sh b/tools/ci/jobs/gcc48_c++11.sh
index 555c9780a..752d7cc23 100755
--- a/tools/ci/jobs/gcc48_c++11.sh
+++ b/tools/ci/jobs/gcc48_c++11.sh
@@ -38,6 +38,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \
 -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc49.sh b/tools/ci/jobs/gcc49.sh
index 561d9e0b7..ccdab39ae 100755
--- a/tools/ci/jobs/gcc49.sh
+++ b/tools/ci/jobs/gcc49.sh
@@ -13,6 +13,7 @@ aptget_install gcc-4.9 g++-4.9 \
 
 export CXXFLAGS="-fno-var-tracking"
 
+do_init
 run_configure $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc49_c++11.sh b/tools/ci/jobs/gcc49_c++11.sh
index 1d1b8255b..6310587aa 100755
--- a/tools/ci/jobs/gcc49_c++11.sh
+++ b/tools/ci/jobs/gcc49_c++11.sh
@@ -39,6 +39,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \
 -fno-var-tracking -Woverloaded-virtual"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh
index 59f8ad672..2d6f44ad6 100755
--- a/tools/ci/jobs/gcc5.sh
+++ b/tools/ci/jobs/gcc5.sh
@@ -45,6 +45,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wlogical-not-parentheses -Woverloaded-virtual \
 -Wno-variadic-macros -Wno-zero-as-null-pointer-constant"
 
+do_init
 run_configure $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_c++11.sh b/tools/ci/jobs/gcc5_c++11.sh
index 63cb83893..a358820d0 100755
--- a/tools/ci/jobs/gcc5_c++11.sh
+++ b/tools/ci/jobs/gcc5_c++11.sh
@@ -44,6 +44,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual"
 
+do_init
 run_configure $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_h.sh b/tools/ci/jobs/gcc5_h.sh
index 3a24f502c..cbf1e0105 100755
--- a/tools/ci/jobs/gcc5_h.sh
+++ b/tools/ci/jobs/gcc5_h.sh
@@ -11,6 +11,8 @@ aptget_install gcc-5 g++-5 \
     libxml2-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
+
 cd src
 export dir=$(pwd)
 export includes="-I$dir -I/usr/include -I/usr/include/SDL -I/usr/include/libxml2"
diff --git a/tools/ci/jobs/gcc5_h_pugi.sh b/tools/ci/jobs/gcc5_h_pugi.sh
index 5eef3afeb..7c79522c0 100755
--- a/tools/ci/jobs/gcc5_h_pugi.sh
+++ b/tools/ci/jobs/gcc5_h_pugi.sh
@@ -11,6 +11,8 @@ aptget_install gcc-5 g++-5 \
     libpugixml-dev libcurl4-gnutls-dev libpng-dev \
     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
 
+do_init
+
 cd src
 export dir=$(pwd)
 export includes="-I$dir -I/usr/include -I/usr/include/SDL -I/usr/include/libxml2"
diff --git a/tools/ci/jobs/gcc5_lto.sh b/tools/ci/jobs/gcc5_lto.sh
index ad99f796e..62e559cab 100755
--- a/tools/ci/jobs/gcc5_lto.sh
+++ b/tools/ci/jobs/gcc5_lto.sh
@@ -44,6 +44,7 @@ export CXXFLAGS="-ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_sanitize.sh b/tools/ci/jobs/gcc5_sanitize.sh
index 803b29b87..1946e8cb0 100755
--- a/tools/ci/jobs/gcc5_sanitize.sh
+++ b/tools/ci/jobs/gcc5_sanitize.sh
@@ -53,6 +53,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wcomment -Wmissing-braces -Wnonnull -Wopenmp-simd -Wparentheses \
 -Wreturn-type -Wsequence-point -Wswitch"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh
index 4a6803e14..f6b863afc 100755
--- a/tools/ci/jobs/gcc5_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc5_sanitize_tests.sh
@@ -53,6 +53,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wcomment -Wmissing-braces -Wnonnull -Wopenmp-simd -Wparentheses \
 -Wreturn-type -Wsequence-point -Wswitch"
 
+do_init
 run_configure --enable-unittests=yes
 export SDL_VIDEODRIVER=dummy
 export ASAN_OPTIONS=detect_leaks=0
diff --git a/tools/ci/jobs/gcc5_sdl2.sh b/tools/ci/jobs/gcc5_sdl2.sh
index d0502d643..835211cf1 100755
--- a/tools/ci/jobs/gcc5_sdl2.sh
+++ b/tools/ci/jobs/gcc5_sdl2.sh
@@ -46,6 +46,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wlogical-not-parentheses \
 -Wno-variadic-macros -Wno-zero-as-null-pointer-constant"
 
+do_init
 run_configure --with-sdl2 $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_sdl2_c++11.sh b/tools/ci/jobs/gcc5_sdl2_c++11.sh
index 8c9cc6afd..7c27a853e 100755
--- a/tools/ci/jobs/gcc5_sdl2_c++11.sh
+++ b/tools/ci/jobs/gcc5_sdl2_c++11.sh
@@ -45,6 +45,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses"
 
+do_init
 run_configure --with-sdl2 $*
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gcc5_sdl2_tests.sh b/tools/ci/jobs/gcc5_sdl2_tests.sh
index e9f193133..1efd6cddf 100755
--- a/tools/ci/jobs/gcc5_sdl2_tests.sh
+++ b/tools/ci/jobs/gcc5_sdl2_tests.sh
@@ -44,6 +44,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual"
 
+do_init
 run_configure --with-sdl2 --enable-unittests=yes
 export SDL_VIDEODRIVER=dummy
 run_make check
diff --git a/tools/ci/jobs/gcc5_tarball.sh b/tools/ci/jobs/gcc5_tarball.sh
index 655caf3ae..f6d12107f 100755
--- a/tools/ci/jobs/gcc5_tarball.sh
+++ b/tools/ci/jobs/gcc5_tarball.sh
@@ -44,6 +44,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual"
 
+do_init
 run_configure
 run_tarball test
 run_configure
diff --git a/tools/ci/jobs/gcc5_tests.sh b/tools/ci/jobs/gcc5_tests.sh
index a4b49a9a7..1a002e45a 100755
--- a/tools/ci/jobs/gcc5_tests.sh
+++ b/tools/ci/jobs/gcc5_tests.sh
@@ -44,6 +44,7 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \
 -Wswitch-bool -Wmemset-transposed-args -Wchkp -Wc++14-compat -Wsized-deallocation \
 -Wlogical-not-parentheses -Woverloaded-virtual"
 
+do_init
 run_configure --enable-unittests=yes
 export SDL_VIDEODRIVER=dummy
 run_make check
diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh
index cf7c73665..1204411da 100755
--- a/tools/ci/jobs/gccsnapshot.sh
+++ b/tools/ci/jobs/gccsnapshot.sh
@@ -322,6 +322,7 @@ export CXXFLAGS="${CXXFLAGS} -Wzero-as-null-pointer-constant"
 #export CXXFLAGS="${CXXFLAGS} -Wzerotrip"
 #export CXXFLAGS="${CXXFLAGS} -frequire-return-statement"
 
+do_init
 run_configure
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh
index 66a9dcb71..6cb3b20ec 100755
--- a/tools/ci/jobs/gccsnapshot_sdl2.sh
+++ b/tools/ci/jobs/gccsnapshot_sdl2.sh
@@ -325,6 +325,7 @@ export CXXFLAGS="${CXXFLAGS} -Wzero-as-null-pointer-constant"
 #export CXXFLAGS="${CXXFLAGS} -Wzerotrip"
 #export CXXFLAGS="${CXXFLAGS} -frequire-return-statement"
 
+do_init
 run_configure --with-sdl2
 run_make
 run_check_warnings
diff --git a/tools/ci/jobs/mplint.sh b/tools/ci/jobs/mplint.sh
index 0ec5421e4..918417db1 100755
--- a/tools/ci/jobs/mplint.sh
+++ b/tools/ci/jobs/mplint.sh
@@ -11,6 +11,8 @@ aptget_install gcc g++ git \
 
 export CXXFLAGS="-std=gnu++11"
 
+do_init
+
 git clone https://gitlab.com/manaplus/mplint.git
 cd mplint
 run_configure_simple
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 053f36b64..5db38aa02 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -7,11 +7,14 @@ export dir=$(pwd)
 export ERRFILE=${dir}/logs/${LOGFILE}
 
 cat /etc/os-release
-$CC --version
-$CXX --version
 
 rm ${ERRFILE}
 
+function do_init {
+    $CC --version
+    $CXX --version
+}
+
 function aptget_update {
     apt-get update
     if [ "$?" != 0 ]; then