From a6f6b9b1f47502caf0c2cbf41d75cd8e84ab9cfd Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Tue, 23 Jun 2020 14:12:50 +0200
Subject: [PATCH] Update .ci submodule to ci-scripts v3.0.2

---
 .appveyor.yml | 22 ++++++++++++++--------
 .ci           |  2 +-
 .travis.yml   | 50 +++++++++++++++++++++++++++++++++++---------------
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ef5d5f2..5774247 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -35,6 +35,14 @@ skip_commits:
     - '**/*.md'
     - '.travis.yml'
 
+#---------------------------------#
+#       additional packages       #
+#---------------------------------#
+
+install:
+# fetch submodules (like ci-scripts)
+  - cmd: git submodule update --init --recursive
+
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -48,9 +56,9 @@ image: Visual Studio 2019
 
 # Build Configurations: dll/static, regular/debug
 configuration:
-  - dynamic
+  - default
   - static
-  - dynamic-debug
+  - debug
   - static-debug
 
 # Environment variables: compiler toolchain, base version, setup file, ...
@@ -87,18 +95,16 @@ platform:
 #     building & testing          #
 #---------------------------------#
 
-install:
-  - cmd: git submodule update --init --recursive
-  - cmd: python .ci/appveyor/do.py prepare
-
 build_script:
-  - cmd: python .ci/appveyor/do.py build
+  - cmd: python .ci/cue.py prepare
+  - cmd: python .ci/cue.py build
 
 test_script:
-  - cmd: python .ci/appveyor/do.py test
+  - cmd: python .ci/cue.py test
 
 on_finish:
   - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - cmd: python .ci/cue.py test-results
 
 #---------------------------------#
 #         debugging               #
diff --git a/.ci b/.ci
index ba5508b..b3091e6 160000
--- a/.ci
+++ b/.ci
@@ -1 +1 @@
-Subproject commit ba5508b39eee4e4717bdf7861220a8c24e572142
+Subproject commit b3091e6d6f75838ad370395d7265fb303850a202
diff --git a/.travis.yml b/.travis.yml
index 3148414..a8b2127 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
   global:
     - SETUP_PATH=.ci-local:.ci
     - EXTRA="CMD_CXXFLAGS=-std=c++11"
+    - BASE_RECURSIVE=NO
 
 addons:
   apt:
@@ -33,24 +34,26 @@ addons:
     update: true
 
 install:
-  - ./.ci/travis/prepare.sh
+  - python .ci/cue.py prepare
 
 script:
-  - ./.ci/travis/build.sh
+  - python .ci/cue.py build
+  - python .ci/cue.py test
+  - python .ci/cue.py test-results
 
-# If you need to do more during install and build,
-# add a local directory to your module and do e.g.
-#  - ./.ci-local/travis/install-extras.sh
 
 # Define build jobs
 
 # Well-known variables to use
 # SET         source setup file
 # ADD_MODULES extra modules (for a specific job)
-# EXTRA       content will be added to make command line
-# STATIC      set to YES for static build (default: NO)
+# BCFG        build configuration (static/debug/static-debug;
+#             default: shared-optimized)
 # TEST        set to NO to skip running the tests (default: YES)
 # VV          set to make build scripts verbose (default: unset)
+# EXTRA       content will be added to make command line
+# EXTRA1..5   more additional arguments for the make command
+#             (one argument per variable)
 
 # Usually from setup files, but may be specified or overridden
 #  on a job line
@@ -64,31 +67,31 @@ jobs:
 
 # Different configurations of default gcc and clang
 
-  - env: BASE=7.0 BASE_RECURSIVE=NO
+  - env: BASE=7.0
 
-  - env: BASE=7.0 BASE_RECURSIVE=NO
+  - env: BASE=7.0
     compiler: clang
 
-  - env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
+  - env: BASE=7.0 BCFG=static
 
   - env: BASE=3.15
 
-  - env: BASE=3.15 STATIC=YES
+  - env: BASE=3.15 BCFG=static
 
   - env: BASE=R3.15.3
 
-  - env: BASE=R3.15.3 STATIC=YES
+  - env: BASE=R3.15.3 BCFG=static
 
   - env: BASE=R3.14.12.8
 
-  - env: BASE=R3.14.12.8 STATIC=YES
+  - env: BASE=R3.14.12.8 BCFG=static
 
 # Trusty: compiler versions very close to RHEL 7
 
-  - env: BASE=7.0 BASE_RECURSIVE=NO
+  - env: BASE=7.0
     dist: trusty
 
-  - env: BASE=7.0 STATIC=YES BASE_RECURSIVE=NO
+  - env: BASE=7.0 BCFG=static
     dist: trusty
 
 # Cross-compilation to RTEMS 4.x doesn't work (g++ 4.4.x is too old)
@@ -100,3 +103,20 @@ jobs:
   - env: BASE=3.15
     os: osx
     compiler: clang
+
+# Windows builds
+
+  - env: BASE=7.0
+    os: windows
+    compiler: vs2017
+
+  - env: BASE=7.0 BCFG=static
+    os: windows
+    compiler: vs2017
+
+  - env: BASE=R3.15.3
+    os: windows
+    compiler: vs2017
+
+  - env: BASE=7.0
+    os: windows