From bb14939c6492e648fedc29e6da35641e98b9c824 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 18 Sep 2019 09:36:56 +0000
Subject: Add 3 more builds with Clang (UTF_MAX=6, UTF_MAX=3, NO_DEPRECATED).
 Change build order a little: Do all static builds after the corresponding
 shared builds.

---
 .travis.yml | 70 +++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d2a61e..6562c0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,6 @@ matrix:
       compiler: gcc
       env:
         - BUILD_DIR=unix
-    - name: "Linux/GCC/Static"
-      os: linux
-      dist: xenial
-      compiler: gcc
-      env:
-        - CFGOPT="--disable-shared"
-        - BUILD_DIR=unix
     - name: "Linux/GCC/Shared: UTF_MAX=6"
       os: linux
       dist: xenial
@@ -37,8 +30,14 @@ matrix:
       compiler: gcc
       env:
         - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_NO_DEPRECATED=1
-# Debug build. Running test-cases disabled, because it is currently failing.
+        - CFGOPT="CFLAGS=-DTCL_NO_DEPRECATED=1"
+    - name: "Linux/GCC/Static"
+      os: linux
+      dist: xenial
+      compiler: gcc
+      env:
+        - CFGOPT="--disable-shared"
+        - BUILD_DIR=unix
     - name: "Linux/GCC/Debug"
       os: linux
       dist: xenial
@@ -102,6 +101,27 @@ matrix:
       compiler: clang
       env:
         - BUILD_DIR=unix
+    - name: "Linux/Clang/Shared: UTF_MAX=6"
+      os: linux
+      dist: xenial
+      compiler: clang
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=6
+    - name: "Linux/Clang/Shared: UTF_MAX=3"
+      os: linux
+      dist: xenial
+      compiler: clang
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=3
+    - name: "Linux/Clang/Shared:NO_DEPRECATED"
+      os: linux
+      dist: xenial
+      compiler: clang
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT="CFLAGS=-DTCL_NO_DEPRECATED=1"
     - name: "Linux/Clang/Static"
       os: linux
       dist: xenial
@@ -175,41 +195,41 @@ matrix:
         # Include a high visibility marker that tests are skipped outright
         - >
           echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
-    - name: "Linux-cross-Windows/GCC/Static/no test"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=6"
       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"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6"
       script: *crosstest
-    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=6"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=3"
       os: linux
       dist: xenial
       compiler: x86_64-w64-mingw32-gcc
       addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=6"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3"
       script: *crosstest
-    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=3"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
       compiler: x86_64-w64-mingw32-gcc
       addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=3"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows/GCC/Shared/no test: NO_DEPRECATED"
+    - 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 CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
       script: *crosstest
     - name: "Linux-cross-Windows/GCC/Debug/no test"
       os: linux
@@ -239,41 +259,41 @@ matrix:
         - BUILD_DIR=win
         - CFGOPT=--host=i686-w64-mingw32
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Static/no test"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6"
       os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=6"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3"
       os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=6"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=3"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=3"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
+    - name: "Linux-cross-Windows-32/GCC/Static/no test"
       os: linux
       dist: xenial
       compiler: i686-w64-mingw32-gcc
       addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
       script: *crosstest
     - name: "Linux-cross-Windows-32/GCC/Debug/no test"
       os: linux
-- 
cgit v0.12