Merge 8.7

1 files changed, 194 insertions, 67 deletions

diff --git a/.travis.yml b/.travis.yml
index 538006d..32467d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,37 +10,34 @@ matrix:
       compiler: gcc
       env:
         - BUILD_DIR=unix
-    - name: "Linux/GCC/Static"
+    - name: "Linux/GCC/Shared: UTF_MAX=4"
       os: linux
       dist: xenial
       compiler: gcc
       env:
-        - CFGOPT=--disable-shared
         - BUILD_DIR=unix
-    - name: "Linux/GCC/Shared: UTF_MAX=4"
+        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4
+    - name: "Linux/GCC/Shared: NO_DEPRECATED"
       os: linux
       dist: xenial
       compiler: gcc
       env:
         - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4
-    - name: "Linux/GCC/Shared: NO_DEPRECATED"
+        - CFGOPT="CFLAGS=-DTCL_NO_DEPRECATED=1"
+    - name: "Linux/GCC/Static"
       os: linux
       dist: xenial
       compiler: gcc
       env:
+        - CFGOPT="--disable-shared"
         - BUILD_DIR=unix
-        - CFGOPT=CFLAGS=-DTCL_NO_DEPRECATED=1
-# Debug build. Running test-cases disabled, because it is currently failing.
-    - name: "Linux/GCC/Debug/no test"
+    - name: "Linux/GCC/Debug"
       os: linux
       dist: xenial
       compiler: gcc
       env:
         - BUILD_DIR=unix
-        - CFGOPT=--enable-symbols=all
-      script:
-        - make all tcltest
+        - CFGOPT="--enable-symbols"
 # Older versions of GCC...
     - name: "Linux/GCC 7/Shared"
       os: linux
@@ -97,23 +94,34 @@ matrix:
       compiler: clang
       env:
         - BUILD_DIR=unix
+    - name: "Linux/Clang/Shared: UTF_MAX=4"
+      os: linux
+      dist: xenial
+      compiler: clang
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT=CFLAGS=-DTCL_UTF_MAX=4
+    - 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
       compiler: clang
       env:
-        - CFGOPT=--disable-shared
+        - CFGOPT="--disable-shared"
         - BUILD_DIR=unix
-# Debug build. Running test-cases disabled, because it is currently failing.
-    - name: "Linux/Clang/Debug/no test"
+    - name: "Linux/Clang/Debug"
       os: linux
       dist: xenial
       compiler: clang
       env:
         - BUILD_DIR=unix
-        - CFGOPT=--enable-symbols=all
-      script:
-        - make all tcltest
+        - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
     - name: "macOS/Xcode 11/Shared/Unix-like"
       os: osx
@@ -132,7 +140,7 @@ matrix:
         - make test styles=develop
     - name: "macOS/Xcode 10/Shared"
       os: osx
-      osx_image: xcode10.2
+      osx_image: xcode10.3
       env:
         - BUILD_DIR=macosx
       install: []
@@ -151,118 +159,118 @@ matrix:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
-# Test with mingw-w64 (32 bit) cross-compile
+# Test with mingw-w64 cross-compile
 # Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
+    - name: "Linux-cross-Windows/GCC/Shared/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: &mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: &mingw64
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
+            - binutils-mingw-w64-x86-64
+            - gcc-mingw-w64-x86-64
             - gcc-mingw-w64
-            - gcc-multilib
             - wine
       env:
         - BUILD_DIR=win
-        - CFGOPT=--host=i686-w64-mingw32
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
       script: &crosstest
         - make all tcltest
         # Include a high visibility marker that tests are skipped outright
         - >
           echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`"
-    - name: "Linux-cross-Windows-32/GCC/Static/no test"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: UTF_MAX=4"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=4"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=4"
+    - name: "Linux-cross-Windows/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=4"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
+    - name: "Linux-cross-Windows/GCC/Static/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
       script: *crosstest
-    - name: "Linux-cross-Windows-32/GCC/Debug/no test"
+    - name: "Linux-cross-Windows/GCC/Debug/no test"
       os: linux
       dist: xenial
-      compiler: i686-w64-mingw32-gcc
-      addons: *mingw32
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=i686-w64-mingw32 --enable-symbols"
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
       script: *crosstest
-# Test with mingw-w64 (64 bit)
+# Test with mingw-w64 (32 bit) cross-compile
 # Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: &mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: &mingw32
         apt:
           packages:
             - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
+            - binutils-mingw-w64-i686
+            - gcc-mingw-w64-i686
             - gcc-mingw-w64
+            - gcc-multilib
             - wine
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit"
+        - CFGOPT=--host=i686-w64-mingw32
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Static/no test"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: UTF_MAX=4"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_UTF_MAX=4"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test: UTF_MAX=4"
+    - name: "Linux-cross-Windows-32/GCC/Shared/no test: NO_DEPRECATED"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_UTF_MAX=4"
+        - CFGOPT="--host=i686-w64-mingw32 CFLAGS=-DTCL_NO_DEPRECATED=1"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test: NO_DEPRECATED"
+    - name: "Linux-cross-Windows-32/GCC/Static/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
+        - CFGOPT="--host=i686-w64-mingw32 --disable-shared"
       script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Debug/no test"
+    - name: "Linux-cross-Windows-32/GCC/Debug/no test"
       os: linux
       dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
+      compiler: i686-w64-mingw32-gcc
+      addons: *mingw32
       env:
         - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols"
+        - CFGOPT="--host=i686-w64-mingw32 --enable-symbols"
       script: *crosstest
 # Test on Windows with MSVC native
     - name: "Windows/MSVC/Shared"
@@ -278,7 +286,7 @@ matrix:
       script:
         - cmd.exe /C 'vcvarsall.bat x64 && nmake -f makefile.vc all tcltest'
         - cmd.exe /C 'vcvarsall.bat x64 && nmake -f makefile.vc test'
-    - name: "Windows/MSVC/Shared: UTF_MAX=6"
+    - name: "Windows/MSVC/Shared: UTF_MAX=4"
       os: windows
       compiler: cl
       env: *vcenv
@@ -314,10 +322,129 @@ matrix:
       script:
         - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols -f makefile.vc all tcltest'
         - cmd.exe /C 'vcvarsall.bat x64 && nmake OPTS=symbols -f makefile.vc test'
+# Test on Windows with MSVC native (32-bit)
+    - name: "Windows/MSVC-x86/Shared"
+      os: windows
+      compiler: cl
+      env: *vcenv
+      before_install: *vcpreinst
+      install: []
+      script:
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake -f makefile.vc all tcltest'
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake -f makefile.vc test'
+    - name: "Windows/MSVC-x86/Shared: UTF_MAX=4"
+      os: windows
+      compiler: cl
+      env: *vcenv
+      before_install: *vcpreinst
+      install: []
+      script:
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=utfmax -f makefile.vc all tcltest'
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=utfmax -f makefile.vc test'
+    - name: "Windows/MSVC-x86/Shared: NO_DEPRECATED"
+      os: windows
+      compiler: cl
+      env: *vcenv
+      before_install: *vcpreinst
+      install: []
+      script:
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=nodep -f makefile.vc all tcltest'
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=nodep -f makefile.vc test'
+    - name: "Windows/MSVC-x86/Static"
+      os: windows
+      compiler: cl
+      env: *vcenv
+      before_install: *vcpreinst
+      install: []
+      script:
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static -f makefile.vc all tcltest'
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=static -f makefile.vc test'
+    - name: "Windows/MSVC-x86/Debug"
+      os: windows
+      compiler: cl
+      env: *vcenv
+      before_install: *vcpreinst
+      install: []
+      script:
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols -f makefile.vc all tcltest'
+        - cmd.exe /C 'vcvarsall.bat x86 && nmake OPTS=symbols -f makefile.vc test'
+# Test on Windows with GCC native
+    - name: "Windows/GCC/Shared"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-64bit"
+      before_install: &makepreinst
+        - choco install make
+        - cd ${BUILD_DIR}
+    - name: "Windows/GCC/Shared: UTF_MAX=4"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-64bit CFLAGS=-DTCL_UTF_MAX=4"
+      before_install: *makepreinst
+    - name: "Windows/GCC/Shared: NO_DEPRECATED"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-64bit CFLAGS=-DTCL_NO_DEPRECATED=1"
+      before_install: *makepreinst
+    - name: "Windows/GCC/Static"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-64bit --disable-shared"
+      before_install: *makepreinst
+    - name: "Windows/GCC/Debug"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-64bit --enable-symbols"
+      before_install: *makepreinst
+# Test on Windows with GCC native (32-bit)
+    - name: "Windows/GCC-x86/Shared"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+      before_install: *makepreinst
+    - name: "Windows/GCC-x86/Shared: UTF_MAX=4"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="CFLAGS=-DTCL_UTF_MAX=4"
+      before_install: *makepreinst
+    - name: "Windows/GCC-x86/Shared: NO_DEPRECATED"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="CFLAGS=-DTCL_NO_DEPRECATED=1"
+      before_install: *makepreinst
+    - name: "Windows/GCC-x86/Static"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--disable-shared"
+      before_install: *makepreinst
+    - name: "Windows/GCC-x86/Debug"
+      os: windows
+      compiler: gcc
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--enable-symbols"
+      before_install: *makepreinst
 before_install:
   - cd ${BUILD_DIR}
 install:
-  - ./configure ${CFGOPT} --prefix=$HOME
+  - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
 before_script:
   - export ERROR_ON_FAILURES=1
 script: