travis: refactor and clean up

This commit is contained in:
Chris Beck 2014-12-12 04:38:41 -05:00
parent 7cb0f5c86a
commit bde498b55b

View file

@ -34,27 +34,25 @@ before_install:
- export EXTRA_FLAGS_RELEASE="-O0"
- export WML_TEST_TIME=40
- export NLS=false
- export ALTERNATE_CONFIGURATION=false
- export CXX11=false
- if [ "$BUILD" = 3 ]; then export ALTERNATE_CONFIGURATION=true; fi
- if [ "$BUILD" = 3 ]; then export STRICT_COMPILATION=false; fi
- if [ "$BUILD" = 3 ]; then export EXTRA_FLAGS_RELEASE=""; fi
- if [ "$BUILD" = 3 ]; then export WML_TEST_TIME=20; fi
- if [ "$BUILD" = 4 ]; then export CXX11=true; fi
- if [ "$BUILD" = 4 ]; then export EXTRA_FLAGS_RELEASE="-O0 -Wno-literal-suffix -Wno-deprecated-declarations"; fi
- if [ "$BUILD" = 4 ]; then export CPP_TESTS=false; fi
- if [ "$BUILD" = 5 ]; then export NLS=true; fi
- if [ "$BUILD" = 5 ]; then export TARGETS="translations"; fi
- if [ "$BUILD" = 5 ]; then export WML_TESTS=false; fi
- if [ "$BUILD" = 5 ]; then export CPP_TESTS=false; fi
- if [ "$BUILD" = 5 ]; then export PLAY_TEST=false; fi
- if [ "$ALTERNATE_CONFIGURATION" = true ]; then export STRICT_COMPILATION=false; fi
- if [ "$ALTERNATE_CONFIGURATION" = true ]; then export EXTRA_FLAGS_RELEASE=""; fi
- if [ "$ALTERNATE_CONFIGURATION" = true ]; then export WML_TEST_TIME=20; fi
- if [ "$CXX" = "g++" ]; then export WML_TESTS=false; fi
- if [ "$CXX" = "g++" ]; then export PLAY_TEST=false; fi
- if [ "$CXX" = "g++" ]; then export CHECK_UTF8=false; fi
# - if [ "$CXX11" = true ]; then export STRICT_COMPILATION=false; fi
install:
- sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ saucy main universe"