summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-08 13:30:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-08 13:30:09 (GMT)
commit7f375dfb32fb373b00130ef8729622758f1d009a (patch)
treec80b8458bb886a6133d1cec42780c04f690851b2 /.travis.yml
parent327ece5571f902a73cfb1ea283c6c93a62d1c09b (diff)
parente092b29faa1269648eb8fcddc2527428c2e4876b (diff)
downloadtcl-7f375dfb32fb373b00130ef8729622758f1d009a.zip
tcl-7f375dfb32fb373b00130ef8729622758f1d009a.tar.gz
tcl-7f375dfb32fb373b00130ef8729622758f1d009a.tar.bz2
Merge 8.5
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml72
1 files changed, 36 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml
index 423eeb2..05d9537 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,6 +137,42 @@ matrix:
- BUILD_DIR=macosx
install: []
script: *mactest
+# Test with mingw-w64 cross-compile
+# Doesn't run tests because wine is only an imperfect Windows emulation
+ - name: "Linux-cross-Windows/GCC/Shared/no test"
+ os: linux
+ dist: xenial
+ compiler: x86_64-w64-mingw32-gcc
+ addons: &mingw64
+ apt:
+ packages:
+ - gcc-mingw-w64-base
+ - binutils-mingw-w64-x86-64
+ - gcc-mingw-w64-x86-64
+ - gcc-mingw-w64
+ - wine
+ env:
+ - BUILD_DIR=win
+ - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
+ script: *crosstest
+ - name: "Linux-cross-Windows/GCC/Static/no test"
+ os: linux
+ dist: xenial
+ compiler: x86_64-w64-mingw32-gcc
+ addons: *mingw64
+ env:
+ - BUILD_DIR=win
+ - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
+ script: *crosstest
+ - name: "Linux-cross-Windows/GCC/Debug/no test"
+ os: linux
+ dist: xenial
+ compiler: x86_64-w64-mingw32-gcc
+ addons: *mingw64
+ env:
+ - BUILD_DIR=win
+ - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
+ script: *crosstest
# Test with mingw-w64 (32 bit) cross-compile
# Doesn't run tests because wine is only an imperfect Windows emulation
- name: "Linux-cross-Windows-32/GCC/Shared/no test"
@@ -178,42 +214,6 @@ matrix:
- BUILD_DIR=win
- CFGOPT="--host=i686-w64-mingw32 --enable-symbols"
script: *crosstest
-# Test with mingw-w64 (64 bit)
-# Doesn't run tests because wine is only an imperfect Windows emulation
- - name: "Linux-cross-Windows-64/GCC/Shared/no test"
- os: linux
- dist: xenial
- compiler: x86_64-w64-mingw32-gcc
- addons: &mingw64
- apt:
- packages:
- - gcc-mingw-w64-base
- - binutils-mingw-w64-x86-64
- - gcc-mingw-w64-x86-64
- - gcc-mingw-w64
- - wine
- env:
- - BUILD_DIR=win
- - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
- script: *crosstest
- - name: "Linux-cross-Windows-64/GCC/Static/no test"
- os: linux
- dist: xenial
- compiler: x86_64-w64-mingw32-gcc
- addons: *mingw64
- env:
- - BUILD_DIR=win
- - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
- script: *crosstest
- - name: "Linux-cross-Windows-64/GCC/Debug/no test"
- os: linux
- dist: xenial
- compiler: x86_64-w64-mingw32-gcc
- addons: *mingw64
- env:
- - BUILD_DIR=win
- - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
- script: *crosstest
# Test on Windows with MSVC native
- name: "Windows/MSVC/Shared"
os: windows