diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-04-02 18:36:52 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-20 16:04:56 +0200 |
| commit | 45c6e23c978da0b23df5e5a9a3c2e631b79ba497 (patch) | |
| tree | 886bf62d10c214c2ea08d62f7cf04dbc8348fbdf /.travis.yml | |
| parent | f863ad0c59374ee8cc91dcae71ef60ceabc969f1 (diff) | |
Remove --classic build entirely
The Unix build was the last to retain the classic build scheme. The
new unified scheme has matured enough, even though some details may
need polishing.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index f180a446ac..abdfe0807e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ env: - CONFIG_OPTS="" - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes" - - CONFIG_OPTS="--classic no-shared" BUILDONLY="yes" - - CONFIG_OPTS="--classic" BUILDONLY="yes" - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes" @@ -60,34 +58,24 @@ matrix: before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME - tar -xvzf _srcdist.tar.gz - - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then - srcdir=.; - cd _srcdist; - else - srcdir=../_srcdist; - mkdir _build; - cd _build; - fi + - mkdir _build; + - cd _build; - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then CC="ccache $CC"; fi; - $srcdir/config $CONFIG_OPTS; + ../_srcdir/config $CONFIG_OPTS; fi - cd .. script: - - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then - cd _srcdist; - else - cd _build; - fi + - cd _build; - make - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then |