diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-30 23:39:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-30 23:39:11 +0300 |
commit | 8bcada9f15440284b58355c565df1151bd017f21 (patch) | |
tree | ab9533aa8467fbb91dedd7832528538d9db06161 | |
parent | 04bd779deaf42fa14a49ae88d77c06eab0d18512 (diff) | |
download | plus-8bcada9f15440284b58355c565df1151bd017f21.tar.gz plus-8bcada9f15440284b58355c565df1151bd017f21.tar.bz2 plus-8bcada9f15440284b58355c565df1151bd017f21.tar.xz plus-8bcada9f15440284b58355c565df1151bd017f21.zip |
Add into ci scripts clang 3.9 with C++11 flags.
Also add some warnings into clang 3.9
-rw-r--r-- | .gitlab-ci.yml | 6 | ||||
-rwxr-xr-x | tools/ci/jobs/clang39.sh | 3 | ||||
-rwxr-xr-x | tools/ci/jobs/clang39.sh_c++11.sh | 29 | ||||
-rwxr-xr-x | tools/ci/jobs/clang39_sdl2.sh | 3 |
4 files changed, 37 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07c29b43e..3ba2f0c4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,12 @@ clang-3.9: - ./tools/ci/jobs/clang39.sh image: debian:unstable +clang-3.9_c++11: + stage: build + script: + - ./tools/ci/jobs/clang39.sh_c++11.sh + image: debian:unstable + gcc-4.8_c++11: stage: build script: diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh index 5c1b0c489..d40df6b90 100755 --- a/tools/ci/jobs/clang39.sh +++ b/tools/ci/jobs/clang39.sh @@ -17,8 +17,7 @@ export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversio -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \ -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ --Wno-variadic-macros -Wno-double-promotion \ --Wno-old-style-cast" +-Wno-variadic-macros -Wno-double-promotion" do_init run_configure --enable-werror $* diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh new file mode 100755 index 000000000..567163118 --- /dev/null +++ b/tools/ci/jobs/clang39.sh_c++11.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +export CC=clang-3.9 +export CXX=clang++-3.9 +export LOGFILE=clang39.log + +source ./tools/ci/scripts/init.sh + +aptget_install clang-3.9 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="-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 \ +-Wno-shorten-64-to-32 -Wno-missing-variable-declarations \ +-Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ +-Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ +-Wno-variadic-macros -Wno-double-promotion \ +-O3 -std=c++11 -Wno-c++98-compat-pedantic" + +do_init +run_configure --enable-werror $* +run_make + +source ./tools/ci/scripts/exit.sh + +exit 0 diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh index 8bd9cb382..416fb0070 100755 --- a/tools/ci/jobs/clang39_sdl2.sh +++ b/tools/ci/jobs/clang39_sdl2.sh @@ -17,8 +17,7 @@ export CXXFLAGS="-Weverything -Wno-documentation -Wno-padded -Wno-sign-conversio -Wno-shorten-64-to-32 -Wno-missing-variable-declarations \ -Wno-disabled-macro-expansion -Wno-format-nonliteral -stdlib=libc++ \ -Wno-reserved-id-macro -Wno-packed -Wno-documentation-unknown-command \ --Wno-variadic-macros -Wno-double-promotion \ --Wno-old-style-cast" +-Wno-variadic-macros -Wno-double-promotion" do_init run_configure --enable-werror --with-sdl2 $* |