diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-31 21:02:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-31 21:02:42 (GMT) |
| commit | b3dceb53606507960d33a6a90dfcb94c720ace30 (patch) | |
| tree | b6813b75561a05cfe7383df0d767304b7dcb7a26 | |
| parent | 434a115a3c3cbd45b3e01a1af2ad1e960077a056 (diff) | |
| download | tcl-b3dceb53606507960d33a6a90dfcb94c720ace30.zip tcl-b3dceb53606507960d33a6a90dfcb94c720ace30.tar.gz tcl-b3dceb53606507960d33a6a90dfcb94c720ace30.tar.bz2 | |
Make MacOSX compile work (hopefully) and cross-compile on mingw-w64 (compile only, no unit-test yet)
| -rw-r--r-- | .travis.yml | 82 |
1 files changed, 68 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 0f8af5a..64801ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,25 @@ matrix: - os: linux compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix + - MATRIX_EVAL="" + - BUILD_DIR=unix - os: linux compiler: clang env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - MATRIX_EVAL="" + - BUILD_DIR=unix + - CFGOPT=--disable-shared - os: linux compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix + - MATRIX_EVAL="" + - BUILD_DIR=unix - os: linux compiler: gcc env: - - MATRIX_EVAL="" BUILD_DIR=unix CFGOPT=--disable-shared + - MATRIX_EVAL="" + - BUILD_DIR=unix + - CFGOPT=--disable-shared - os: linux compiler: gcc addons: @@ -28,7 +34,8 @@ matrix: packages: - g++-4.9 env: - - MATRIX_EVAL="CC=gcc-4.9" BUILD_DIR=unix + - MATRIX_EVAL="CC=gcc-4.9" + - BUILD_DIR=unix - os: linux compiler: gcc addons: @@ -38,7 +45,8 @@ matrix: packages: - g++-5 env: - - MATRIX_EVAL="CC=gcc-5" BUILD_DIR=unix + - MATRIX_EVAL="CC=gcc-5" + - BUILD_DIR=unix - os: linux compiler: gcc addons: @@ -48,7 +56,8 @@ matrix: packages: - g++-6 env: - - MATRIX_EVAL="CC=gcc-6" BUILD_DIR=unix + - MATRIX_EVAL="CC=gcc-6" + - BUILD_DIR=unix - os: linux compiler: gcc addons: @@ -58,29 +67,74 @@ matrix: packages: - g++-7 env: - - MATRIX_EVAL="CC=gcc-7" BUILD_DIR=unix + - MATRIX_EVAL="CC=gcc-7" + - BUILD_DIR=unix - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=unix + - MATRIX_EVAL="" + - BUILD_DIR=unix - os: osx osx_image: xcode8 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - MATRIX_EVAL="" + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode9 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - MATRIX_EVAL="" + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 - os: osx osx_image: xcode10 env: - - MATRIX_EVAL="" BUILD_DIR=macosx NO_DIRECT_CONFIGURE=1 + - MATRIX_EVAL="" + - BUILD_DIR=macosx + - NO_DIRECT_CONFIGURE=1 +# Test with mingw-w64 (32 bit) + - os: linux + compiler: i686-w64-mingw32-gcc + addons: + apt: + packages: + - gcc-mingw-w64-base + - binutils-mingw-w64-i686 + - gcc-mingw-w64-i686 + - gcc-mingw-w64 + - gcc-multilib + - wine + env: + - MATRIX_EVAL="" + - BUILD_DIR=win + - CFGOPT=--host=i686-w64-mingw32 + - NO_DIRECT_TEST=1 + +# Test with mingw-w64 (64 bit) + - os: linux + compiler: x86_64-w64-mingw32-gcc + addons: + apt: + packages: + - gcc-mingw-w64-base + - binutils-mingw-w64-x86-64 + - gcc-mingw-w64-x86-64 + - gcc-mingw-w64 + - wine + env: + - MATRIX_EVAL="" + - BUILD_DIR=win + - CFGOPT=--host=x86_64-w64-mingw32 --enable-64bit + - NO_DIRECT_TEST=1 + ### C builds not currently supported on Windows instances # - os: windows # env: -# - MATRIX_EVAL="" BUILD_DIR=win +# - MATRIX_EVAL="" +# - BUILD_DIR=win before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi - eval "${MATRIX_EVAL}" - export ERROR_ON_FAILURES=1 - cd ${BUILD_DIR} @@ -88,4 +142,4 @@ install: - test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT} script: - make - - make test + - test -n "$NO_DIRECT_TEST" || make test |