diff options
Diffstat (limited to 'tools')
54 files changed, 21 insertions, 261 deletions
diff --git a/tools/ci/jobs/clang.sh b/tools/ci/jobs/clang.sh index ad8c95338..c452826dd 100755 --- a/tools/ci/jobs/clang.sh +++ b/tools/ci/jobs/clang.sh @@ -6,11 +6,6 @@ export LOGFILE=$1.log source ./tools/ci/scripts/init.sh -aptget_install $1 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/clang3.sh b/tools/ci/jobs/clang3.sh index 93c80d5ba..9f2680448 100755 --- a/tools/ci/jobs/clang3.sh +++ b/tools/ci/jobs/clang3.sh @@ -6,11 +6,6 @@ export LOGFILE=clang3.log source ./tools/ci/scripts/init.sh -aptget_install clang libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/clang33.sh b/tools/ci/jobs/clang33.sh index fe28ff40e..9272cccb9 100755 --- a/tools/ci/jobs/clang33.sh +++ b/tools/ci/jobs/clang33.sh @@ -6,11 +6,6 @@ export LOGFILE=clang33.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.3 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-stdlib=libc++" do_init diff --git a/tools/ci/jobs/clang34.sh b/tools/ci/jobs/clang34.sh index e441e5c92..0c52f48bb 100755 --- a/tools/ci/jobs/clang34.sh +++ b/tools/ci/jobs/clang34.sh @@ -6,11 +6,6 @@ export LOGFILE=clang34.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.4 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-stdlib=libc++" do_init diff --git a/tools/ci/jobs/clang35.sh b/tools/ci/jobs/clang35.sh index 65e8819bb..215461b72 100755 --- a/tools/ci/jobs/clang35.sh +++ b/tools/ci/jobs/clang35.sh @@ -6,11 +6,6 @@ export LOGFILE=clang35.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.5 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-stdlib=libc++" do_init diff --git a/tools/ci/jobs/clang36.sh b/tools/ci/jobs/clang36.sh index db46fe154..12caae29a 100755 --- a/tools/ci/jobs/clang36.sh +++ b/tools/ci/jobs/clang36.sh @@ -6,11 +6,6 @@ export LOGFILE=clang36.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.6 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-stdlib=libc++" do_init diff --git a/tools/ci/jobs/clang37.sh b/tools/ci/jobs/clang37.sh index 48a964b14..2b36e1a16 100755 --- a/tools/ci/jobs/clang37.sh +++ b/tools/ci/jobs/clang37.sh @@ -6,11 +6,6 @@ export LOGFILE=clang37.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.7 libc++-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-stdlib=libc++" do_init diff --git a/tools/ci/jobs/clang38.sh b/tools/ci/jobs/clang38.sh index 7501f2b4f..eb2890c3e 100755 --- a/tools/ci/jobs/clang38.sh +++ b/tools/ci/jobs/clang38.sh @@ -6,11 +6,6 @@ export LOGFILE=clang38.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.8 libc++-dev libc++abi-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \ -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \ -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \ diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh index cb090f151..10c0f639e 100755 --- a/tools/ci/jobs/clang39.sh +++ b/tools/ci/jobs/clang39.sh @@ -6,11 +6,6 @@ export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.9 libc++-dev libc++abi-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \ -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \ -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \ diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh index 9186eeddf..f1ed914fe 100755 --- a/tools/ci/jobs/clang39.sh_c++11.sh +++ b/tools/ci/jobs/clang39.sh_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.9 libc++-dev libc++abi-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \ -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \ -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \ diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh index bdd09ff6a..c893f7be1 100755 --- a/tools/ci/jobs/clang39_sdl2.sh +++ b/tools/ci/jobs/clang39_sdl2.sh @@ -6,11 +6,6 @@ export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh -aptget_install clang-3.9 libc++-dev libc++abi-dev \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \ -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \ -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \ diff --git a/tools/ci/jobs/clang40.sh b/tools/ci/jobs/clang40.sh index fccf52618..679fefd30 100755 --- a/tools/ci/jobs/clang40.sh +++ b/tools/ci/jobs/clang40.sh @@ -6,11 +6,6 @@ export LOGFILE=clang40.log source ./tools/ci/scripts/init.sh -aptget_install clang-4.0 libc++-dev libc++abi-dev \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversion \ -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables \ -Wno-overloaded-virtual -Wno-covered-switch-default -Wno-float-equal -Wno-conversion \ diff --git a/tools/ci/jobs/cmake_gcc49.sh b/tools/ci/jobs/cmake_gcc49.sh index 4d2716ab5..5da7cc436 100755 --- a/tools/ci/jobs/cmake_gcc49.sh +++ b/tools/ci/jobs/cmake_gcc49.sh @@ -6,11 +6,6 @@ export LOGFILE=cmake_gcc49.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.9 g++-4.9 \ - make cmake gettext libphysfs-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_cmake run_make diff --git a/tools/ci/jobs/cpplint.sh b/tools/ci/jobs/cpplint.sh index 531d82bbe..c1cd122d5 100755 --- a/tools/ci/jobs/cpplint.sh +++ b/tools/ci/jobs/cpplint.sh @@ -4,8 +4,6 @@ export LOGFILE=cpplint.log source ./tools/ci/scripts/init.sh -aptget_install python wget - rm cpplint.py tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py" chmod +x cpplint.py diff --git a/tools/ci/jobs/deheader.sh b/tools/ci/jobs/deheader.sh index 62e40e480..462320e3b 100755 --- a/tools/ci/jobs/deheader.sh +++ b/tools/ci/jobs/deheader.sh @@ -4,12 +4,6 @@ export LOGFILE2=logs/deheader2.log source ./tools/ci/scripts/init.sh -aptget_install python wget \ - gcc-5 g++-5 \ - libphysfs-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 - export dir=$(pwd) rm deheader diff --git a/tools/ci/jobs/deheader_sdl2.sh b/tools/ci/jobs/deheader_sdl2.sh index e6e0a24ef..462320e3b 100755 --- a/tools/ci/jobs/deheader_sdl2.sh +++ b/tools/ci/jobs/deheader_sdl2.sh @@ -4,12 +4,6 @@ export LOGFILE2=logs/deheader2.log source ./tools/ci/scripts/init.sh -aptget_install python wget \ - gcc-5 g++-5 \ - libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - export dir=$(pwd) rm deheader diff --git a/tools/ci/jobs/doxygen.sh b/tools/ci/jobs/doxygen.sh index a3e7b3a5a..db8855cdc 100755 --- a/tools/ci/jobs/doxygen.sh +++ b/tools/ci/jobs/doxygen.sh @@ -4,10 +4,5 @@ export LOGFILE=doxygen.log source ./tools/ci/scripts/init.sh -aptget_install doxygen graphviz \ - libphysfs-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 - doxygen tools/doxygen/doxygen.conf check_error $? diff --git a/tools/ci/jobs/gcc44.sh b/tools/ci/jobs/gcc44.sh index e70ad8fe3..a6a32e849 100755 --- a/tools/ci/jobs/gcc44.sh +++ b/tools/ci/jobs/gcc44.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc44.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.4 g++-4.4 \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/gcc45.sh b/tools/ci/jobs/gcc45.sh index a4a4dd6b3..b42da3d5e 100755 --- a/tools/ci/jobs/gcc45.sh +++ b/tools/ci/jobs/gcc45.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc45.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.5 g++-4.5 \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh index 965dfd119..6219200a2 100755 --- a/tools/ci/jobs/gcc46.sh +++ b/tools/ci/jobs/gcc46.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc46.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.6 g++-4.6 \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/gcc47.sh b/tools/ci/jobs/gcc47.sh index c77009f78..3b87c4aa6 100755 --- a/tools/ci/jobs/gcc47.sh +++ b/tools/ci/jobs/gcc47.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.7 g++-4.7 \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/gcc47_c++11.sh b/tools/ci/jobs/gcc47_c++11.sh index a343c2238..05ef6c35c 100755 --- a/tools/ci/jobs/gcc47_c++11.sh +++ b/tools/ci/jobs/gcc47_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.7 g++-4.7 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -funswitch-loops \ -std=c++0x" diff --git a/tools/ci/jobs/gcc48.sh b/tools/ci/jobs/gcc48.sh index 9cbaa2804..41063c86c 100755 --- a/tools/ci/jobs/gcc48.sh +++ b/tools/ci/jobs/gcc48.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.8 g++-4.8 \ - make autoconf automake autopoint gettext libphysfs-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 --enable-werror run_make diff --git a/tools/ci/jobs/gcc48_c++11.sh b/tools/ci/jobs/gcc48_c++11.sh index 5e894de7f..d93c51b71 100755 --- a/tools/ci/jobs/gcc48_c++11.sh +++ b/tools/ci/jobs/gcc48_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc48_c++11.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.8 g++-4.8 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc49.sh b/tools/ci/jobs/gcc49.sh index 007ba3293..f427569eb 100755 --- a/tools/ci/jobs/gcc49.sh +++ b/tools/ci/jobs/gcc49.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc49.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.9 g++-4.9 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-fno-var-tracking" do_init diff --git a/tools/ci/jobs/gcc49_c++11.sh b/tools/ci/jobs/gcc49_c++11.sh index 12165a232..ef431a2cf 100755 --- a/tools/ci/jobs/gcc49_c++11.sh +++ b/tools/ci/jobs/gcc49_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc49_c++11.log source ./tools/ci/scripts/init.sh -aptget_install gcc-4.9 g++-4.9 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc5.sh b/tools/ci/jobs/gcc5.sh index edc8f90cf..cad54dd0d 100755 --- a/tools/ci/jobs/gcc5.sh +++ b/tools/ci/jobs/gcc5.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc5_c++11.sh b/tools/ci/jobs/gcc5_c++11.sh index 16879aef9..f87e6ec81 100755 --- a/tools/ci/jobs/gcc5_c++11.sh +++ b/tools/ci/jobs/gcc5_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc5_h.sh b/tools/ci/jobs/gcc5_h.sh index cbf1e0105..1d639561b 100755 --- a/tools/ci/jobs/gcc5_h.sh +++ b/tools/ci/jobs/gcc5_h.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_h.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 cd src diff --git a/tools/ci/jobs/gcc5_h_pugi.sh b/tools/ci/jobs/gcc5_h_pugi.sh index 7c79522c0..1d639561b 100755 --- a/tools/ci/jobs/gcc5_h_pugi.sh +++ b/tools/ci/jobs/gcc5_h_pugi.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_h.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - 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 diff --git a/tools/ci/jobs/gcc5_sanitize.sh b/tools/ci/jobs/gcc5_sanitize.sh index 0d188a3b0..bf2327aab 100755 --- a/tools/ci/jobs/gcc5_sanitize.sh +++ b/tools/ci/jobs/gcc5_sanitize.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_sanitize.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fsanitize=address -fsanitize=undefined \ -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable \ diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh index 66d4975b4..d02c5001a 100755 --- a/tools/ci/jobs/gcc5_sanitize_tests.sh +++ b/tools/ci/jobs/gcc5_sanitize_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc5_tests.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 \ - valgrind - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fsanitize=address -fsanitize=undefined \ -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable \ diff --git a/tools/ci/jobs/gcc5_sdl2.sh b/tools/ci/jobs/gcc5_sdl2.sh index 40e6f4d2e..da3ce2ac7 100755 --- a/tools/ci/jobs/gcc5_sdl2.sh +++ b/tools/ci/jobs/gcc5_sdl2.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_sdl2.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - # need fix -Woverloaded-virtual export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ diff --git a/tools/ci/jobs/gcc5_sdl2_c++11.sh b/tools/ci/jobs/gcc5_sdl2_c++11.sh index 4341221e6..b171f63ce 100755 --- a/tools/ci/jobs/gcc5_sdl2_c++11.sh +++ b/tools/ci/jobs/gcc5_sdl2_c++11.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_sdl2.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - # need fix -Woverloaded-virtual export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ diff --git a/tools/ci/jobs/gcc5_sdl2_tests.sh b/tools/ci/jobs/gcc5_sdl2_tests.sh index c44128562..8c38d4db0 100755 --- a/tools/ci/jobs/gcc5_sdl2_tests.sh +++ b/tools/ci/jobs/gcc5_sdl2_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc5_sdl2_tests.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ - valgrind - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc5_tarball.sh b/tools/ci/jobs/gcc5_tarball.sh index 604b0a995..ea11d59dd 100755 --- a/tools/ci/jobs/gcc5_tarball.sh +++ b/tools/ci/jobs/gcc5_tarball.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc5_tarball.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev xz-utils \ - libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc5_tests.sh b/tools/ci/jobs/gcc5_tests.sh index c5e95275e..058db74f8 100755 --- a/tools/ci/jobs/gcc5_tests.sh +++ b/tools/ci/jobs/gcc5_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc5_tests.log source ./tools/ci/scripts/init.sh -aptget_install gcc-5 g++-5 \ - make autoconf automake autopoint gettext libphysfs-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 \ - valgrind - export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh index e467df30c..5793540fb 100755 --- a/tools/ci/jobs/gcc6.sh +++ b/tools/ci/jobs/gcc6.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_lto.sh b/tools/ci/jobs/gcc6_lto.sh index 53c484d59..8e7211724 100755 --- a/tools/ci/jobs/gcc6_lto.sh +++ b/tools/ci/jobs/gcc6_lto.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-ggdb3 -pipe -ffast-math -O9 -flto -fwhole-program \ -fno-omit-frame-pointer -funswitch-loops -D_FORTIFY_SOURCE=2 -std=gnu++1z \ -Wno-attributes" diff --git a/tools/ci/jobs/gcc6_sanitize.sh b/tools/ci/jobs/gcc6_sanitize.sh index 69b3e6524..04f7e52cf 100755 --- a/tools/ci/jobs/gcc6_sanitize.sh +++ b/tools/ci/jobs/gcc6_sanitize.sh @@ -6,11 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -fsanitize=address -fsanitize=undefined \ diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh index 41940cb08..0fb1bea7e 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ - valgrind - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh index 0c07757c2..1a4d7c093 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh @@ -6,13 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ - gcovr \ - valgrind - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_tarball_tests.sh b/tools/ci/jobs/gcc6_tarball_tests.sh index 51593dc2d..29221a23d 100755 --- a/tools/ci/jobs/gcc6_tarball_tests.sh +++ b/tools/ci/jobs/gcc6_tarball_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc6_tarballtests.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 \ - valgrind - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh index 1a2fdb978..62b647578 100755 --- a/tools/ci/jobs/gcc6_tests.sh +++ b/tools/ci/jobs/gcc6_tests.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 \ - valgrind - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_tests_gcov.sh b/tools/ci/jobs/gcc6_tests_gcov.sh index 97029b872..61278ca71 100755 --- a/tools/ci/jobs/gcc6_tests_gcov.sh +++ b/tools/ci/jobs/gcc6_tests_gcov.sh @@ -6,13 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 \ - gcovr \ - valgrind - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gcc6_tests_simd.sh b/tools/ci/jobs/gcc6_tests_simd.sh index 2b8f2743e..21df222c4 100755 --- a/tools/ci/jobs/gcc6_tests_simd.sh +++ b/tools/ci/jobs/gcc6_tests_simd.sh @@ -6,12 +6,6 @@ export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh -aptget_install gcc-6 g++-6 \ - make autoconf automake autopoint gettext libphysfs-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 \ - valgrind - # remove -flto -fwhole-program because gcc bug with lto + target attribute export CXXFLAGS="-pedantic -ggdb3 -O5 -pipe -Wstrict-aliasing=2 \ diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh index a32b0baf1..6c5e9d106 100755 --- a/tools/ci/jobs/gccsnapshot.sh +++ b/tools/ci/jobs/gccsnapshot.sh @@ -7,11 +7,6 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH source ./tools/ci/scripts/init.sh -aptget_install gcc-snapshot \ - make autoconf automake autopoint gettext libphysfs-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 - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh index 7530b1afe..7c33d3179 100755 --- a/tools/ci/jobs/gccsnapshot_sdl2.sh +++ b/tools/ci/jobs/gccsnapshot_sdl2.sh @@ -7,11 +7,6 @@ export PATH=/usr/lib/gcc-snapshot/bin:$PATH source ./tools/ci/scripts/init.sh -aptget_install gcc-snapshot \ - make autoconf automake autopoint gettext libphysfs-dev \ - libxml2-dev libcurl4-gnutls-dev libpng-dev \ - libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev - export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ -Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ -std=gnu++1z -Wformat=1 \ diff --git a/tools/ci/jobs/gitstats.sh b/tools/ci/jobs/gitstats.sh index a7040bd03..26b756ad5 100755 --- a/tools/ci/jobs/gitstats.sh +++ b/tools/ci/jobs/gitstats.sh @@ -4,8 +4,6 @@ export LOGFILE=gitstats.log source ./tools/ci/scripts/init.sh -aptget_install python zlib1g git-core gnuplot - tools/ci/scripts/retry.sh git clone https://github.com/hoxu/gitstats.git gitstats gitstats/gitstats . stats check_error $? diff --git a/tools/ci/jobs/imagemagiccheck.sh b/tools/ci/jobs/imagemagiccheck.sh index eed0958a4..ac512416b 100755 --- a/tools/ci/jobs/imagemagiccheck.sh +++ b/tools/ci/jobs/imagemagiccheck.sh @@ -2,8 +2,6 @@ source ./tools/ci/scripts/init.sh -aptget_install imagemagick - export LOG="logs/icccheck.log" mkdir logs diff --git a/tools/ci/jobs/mplint.sh b/tools/ci/jobs/mplint.sh index 4b28a3435..c247de0ca 100755 --- a/tools/ci/jobs/mplint.sh +++ b/tools/ci/jobs/mplint.sh @@ -6,9 +6,6 @@ export LOGFILE=mplint_po.log source ./tools/ci/scripts/init.sh -aptget_install gcc g++ git \ - make autoconf automake autopoint gettext - export CXXFLAGS="-std=gnu++11" do_init diff --git a/tools/ci/jobs/pages.sh b/tools/ci/jobs/pages.sh index 0e3c2b020..79acc67ff 100755 --- a/tools/ci/jobs/pages.sh +++ b/tools/ci/jobs/pages.sh @@ -4,8 +4,6 @@ export LOGFILE=pages.log source ./tools/ci/scripts/init.sh -aptget_install git-core python - tools/ci/scripts/retry.sh git clone https://gitlab.com/4144/pagesindexgen.git pagesindexgen mkdir -p public/docs diff --git a/tools/ci/jobs/pngcheck.sh b/tools/ci/jobs/pngcheck.sh index 19c690402..3f7467975 100755 --- a/tools/ci/jobs/pngcheck.sh +++ b/tools/ci/jobs/pngcheck.sh @@ -2,8 +2,6 @@ source ./tools/ci/scripts/init.sh -aptget_install pngcheck - export LOG1="pngcheck.log" export LOG2="pngcheck2.log" diff --git a/tools/ci/scripts/dockerretry.sh b/tools/ci/scripts/dockerretry.sh new file mode 100755 index 000000000..22e38e574 --- /dev/null +++ b/tools/ci/scripts/dockerretry.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# skip if we not in docker +if [[ ${CI_RUNNER_TAGS} != *"docker"* ]]; then + echo "Running from shell. Skipping $*" + exit 0 +fi + +n=0 + +while true; do + $* + if [ "$?" == 0 ]; then + exit 0 + fi + if [[ $n -ge 10 ]]; then + exit -1 + fi + sleep 5s + n=$((n+1)) +done |