Merge branch 'develop'

Author: Flamefire

.appveyor.yml

@@ -20,11 +20,12 @@ matrix:
 
 environment:
   global:
+    B2_CI_VERSION: 1
     # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
     # to use the default for a given environment, comment it out; recommend you build debug and release however:
     # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
     # libraries that care about this exercise it in their Jamfiles...
-    # B2_ADDRESS_MODEL: 64,32
+    B2_ADDRESS_MODEL: 32,64
     B2_LINK: shared,static
     # B2_THREADING: threading=multi,single
     B2_VARIANT: release,debug
@@ -33,21 +34,18 @@ environment:
   matrix:
     - FLAVOR: Visual Studio 2019
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_ADDRESS_MODEL: 32,64
       B2_CXXFLAGS: -permissive-
       B2_CXXSTD: 14,17,latest # 2a
       B2_TOOLSET: msvc-14.2
 
     - FLAVOR: Visual Studio 2017 C++2a Strict
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: 32,64
       B2_CXXFLAGS: -permissive-
       B2_CXXSTD: latest # 2a
       B2_TOOLSET: msvc-14.1
 
     - FLAVOR: Visual Studio 2017 C++14/17
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: 32,64
       B2_CXXSTD: 14,17
       B2_TOOLSET: msvc-14.1
 
@@ -57,14 +55,14 @@ environment:
       B2_CXXSTD: 11,14,17
       B2_TOOLSET: clang-win
 
-    - FLAVOR: Visual Studio 2015 C++14 (Default)
+    - FLAVOR: Visual Studio 2015, 2013
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_ADDRESS_MODEL: 64,32
-      B2_TOOLSET: msvc-14.0
+      B2_TOOLSET: msvc-12.0,msvc-14.0
 
-    - FLAVOR: Visual Studio 2008, 2010, 2012, 2013
+    - FLAVOR: Visual Studio 2008, 2010, 2012
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
+      B2_TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+      B2_ADDRESS_MODEL: 32 # No 64bit support
 
     - FLAVOR: cygwin (32-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -125,25 +123,14 @@ environment:
         secure: Qq4PZ3QlpYtg3HEyn9r2Og==
 
 install:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci
-  - xcopy /s /e /q /i C:\boost-ci\ci .\ci
+  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
+  - xcopy /s /e /q /i /y C:\boost-ci-cloned\ci .\ci
+  - rmdir /s /q C:\boost-ci-cloned
   - ci\appveyor\install.bat
 
 build: off
 
-test_script:
-  - PATH=%ADDPATH%%PATH%
-  - IF DEFINED B2_ADDRESS_MODEL (SET B2_ADDRESS_MODEL=address-model=%B2_ADDRESS_MODEL%)
-  - IF DEFINED B2_LINK (SET B2_LINK=link=%B2_LINK%)
-  - IF DEFINED B2_VARIANT (SET B2_VARIANT=variant=%B2_VARIANT%)
-  - IF DEFINED B2_CXXFLAGS (SET B2_CXXFLAGS=cxxflags=%B2_CXXFLAGS%)
-  # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above
-  - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%)
-  # Echo the complete build command to the build log
-  - IF NOT DEFINED SCRIPT                         (ECHO b2 libs/%SELF:\=/%/test %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
-  # Now go build...
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/%/test %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
+test_script: ci\build.bat
 
 for:
   - matrix:
@@ -181,6 +168,7 @@ for:
       only: [develop] # Doesn't work on master yet
     test_script:
       - ps: |
+            cd "$env:BOOST_ROOT"
             mkdir __build_static | cd
             cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=nowide ..
             cmake --build . --config Debug --parallel 4

.azure-pipelines.yml

@@ -1,5 +1,6 @@
 # Copyright 2015-2019 Rene Rivera.
 # Copyright 2019 Mateusz Loskot <mateusz at loskot dot net>
+# Copyright 2020 Alexander Grund
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -34,10 +35,9 @@ pr:
     - develop
 
 variables:
-  - name: B2_VARIANT
-    value: release,debug
-  - name: B2_LINK
-    value: shared,static
+  B2_CI_VERSION: 1
+  B2_VARIANT: release,debug
+  B2_LINK: shared,static
 
 stages:
 
@@ -51,20 +51,101 @@ stages:
       matrix:
         GCC_8:
           B2_TOOLSET: gcc
-          B2_CXXSTD: 03,11,14,17,2a
+          B2_CXXSTD: 14,17,2a
           CXX: g++-8
           PACKAGES: g++-8
+        GCC_7:
+          B2_TOOLSET: gcc
+          B2_CXXSTD: 11,14,17
+          CXX: g++-7
+          PACKAGES: g++-7
+        GCC_6:
+          B2_TOOLSET: gcc
+          B2_CXXSTD: 11,14
+          CXX: g++-6
+          PACKAGES: g++-6
+        GCC_5:
+          B2_TOOLSET: gcc
+          B2_CXXSTD: 11
+          CXX: g++-5
+          PACKAGES: g++-5
+        GCC_4_9:
+          B2_TOOLSET: gcc
+          B2_CXXSTD: 03,11
+          CXX: g++-4.9
+          PACKAGES: g++-4.9
+        GCC_4_8:
+          B2_TOOLSET: gcc
+          B2_CXXSTD: 03,11
+          CXX: g++-4.8
+          PACKAGES: g++-4.8
         Clang_8:
           B2_TOOLSET: clang
-          B2_CXXSTD: 03,11,14,17,2a
+          B2_CXXSTD: 14,17,2a
           CXX: clang++-8
           PACKAGES: clang-8
           LLVM_REPO: llvm-toolchain-xenial-8
+        Clang_7:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          CXX: clang++-7
+          PACKAGES: clang-7
+          LLVM_REPO: llvm-toolchain-xenial-7
+        Clang_6_libcxx:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 03,11,14,17,2a
+          B2_STDLIB: libc++
+          CXX: clang++-6.0
+          PACKAGES: clang-6.0
+          LLVM_REPO: llvm-toolchain-xenial-6.0
+        Clang_6:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          CXX: clang++-6.0
+          PACKAGES: clang-6.0
+          LLVM_REPO: llvm-toolchain-xenial-6.0
+        Clang_5:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17
+          PACKAGES: clang-5.0
+          CXX: clang++-5.0
+          LLVM_REPO: llvm-toolchain-xenial-5.0
+        Clang_4:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14
+          CXX: clang++-4.0
+          PACKAGES: clang-4.0
+          LLVM_REPO: llvm-toolchain-xenial-4.0
+        Clang_3_9:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 03,11,14
+          CXX: clang++-3.9
+          PACKAGES: clang-3.9
+        Clang_3_8:
+          B2_TOOLSET: clang
+          CXX: clang++-3.8
+          B2_CXXSTD: 03,11,14
+          PACKAGES: clang-3.8
+        Clang_3_7:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 03,11
+          CXX: clang++-3.7
+          PACKAGES: clang-3.7
+        Clang_3_6:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 03,11
+          CXX: clang++-3.6
+          PACKAGES: clang-3.6
+        Clang_3_5:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 03,11
+          CXX: clang++-3.5
+          PACKAGES: clang-3.5
     steps:
     - bash: |
         set -e
 
-        git clone --branch flags https://github.com/Flamefire/boost-ci.git boost-ci-cloned
+        git clone --branch master https://github.com/boostorg/boost-ci.git boost-ci-cloned
         cp -prf boost-ci-cloned/ci .
         rm -rf boost-ci-cloned
         source ci/azure-pipelines/install.sh
@@ -75,30 +156,30 @@ stages:
         echo "BOOST_ROOT=$BOOST_ROOT"
 
         cd $BOOST_ROOT/libs/$SELF
-        ci/azure-pipelines/build.sh --debug-configuration
+        ci/azure-pipelines/build.sh
       displayName: 'Build'
 
   - job: 'Windows'
     strategy:
       matrix:
-        VS_2019_CXX2a_Strict:
+        VS_2019_cxx2a_strict:
           B2_TOOLSET: msvc-14.2
           B2_CXXSTD: latest # 2a
           B2_CXXFLAGS: -permissive-
           B2_ADDRESS_MODEL: 64
           VM_IMAGE: 'windows-2019'
-        VS_2017_CXX2a_Strict:
+        VS_2017_cxx2a_strict:
           B2_TOOLSET: msvc-14.1
           B2_CXXSTD: latest # 2a
           B2_CXXFLAGS: -permissive-
           B2_ADDRESS_MODEL: 64
           VM_IMAGE: 'vs2017-win2016'
-        VS_2017_CXX17:
+        VS_2017_cxx17:
           B2_TOOLSET: msvc-14.1
           B2_CXXSTD: 17
           B2_ADDRESS_MODEL: 64,32
           VM_IMAGE: 'vs2017-win2016'
-        VS_2017_CXX14:
+        VS_2017_cxx14:
           B2_TOOLSET: msvc-14.1
           #B2_CXXSTD: 14 # default
           B2_ADDRESS_MODEL: 64,32
@@ -108,13 +189,12 @@ stages:
       vmImage: $(VM_IMAGE)
     steps:
     - script: |
-        git clone --branch flags https://github.com/Flamefire/boost-ci.git boost-ci-cloned
+        git clone --branch master https://github.com/boostorg/boost-ci.git boost-ci-cloned
         xcopy /s /e /q /i /y boost-ci-cloned\ci .\ci
         rmdir /s /q boost-ci-cloned
-        cmd /k ci\azure-pipelines\install.bat
+        ci\azure-pipelines\install.bat
       displayName: 'Install'
-    - script: |
-        %BOOST_ROOT%\libs\%SELF%\ci\build.bat
+    - script: ci\build.bat
       displayName: 'Build'
 
   - job: 'macOS'
@@ -124,15 +204,45 @@ stages:
       matrix:
         Xcode_11_3_1:
           B2_TOOLSET: clang
-          B2_CXXSTD: 03,11,14,17,2a
+          B2_CXXSTD: 14,17,2a
           XCODE_APP: /Applications/Xcode_11.3.1.app
-          B2_LINK: static
-          B2_JOBS: 3 # Workaround for https://github.com/boostorg/boost-ci/issues/50
+        Xcode_11_2_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.2.1.app
+        Xcode_11_2:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.2.app
+        Xcode_11_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 14,17,2a
+          XCODE_APP: /Applications/Xcode_11.1.app
+        Xcode_10_3:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.3.app
+        Xcode_10_2_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.2.1.app
+        Xcode_10_2:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.2.app
+        Xcode_10_1:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.1.app
+        Xcode_10_0:
+          B2_TOOLSET: clang
+          B2_CXXSTD: 11,14,17,2a
+          XCODE_APP: /Applications/Xcode_10.app
     steps:
     - bash: |
         set -e
 
-        git clone --branch flags https://github.com/Flamefire/boost-ci.git boost-ci-cloned
+        git clone --branch master https://github.com/boostorg/boost-ci.git boost-ci-cloned
         cp -prf boost-ci-cloned/ci .
         rm -rf boost-ci-cloned
         source ci/azure-pipelines/install.sh
@@ -143,5 +253,5 @@ stages:
         echo "BOOST_ROOT=$BOOST_ROOT"
 
         cd $BOOST_ROOT/libs/$SELF
-        ci/azure-pipelines/build.sh --debug-configuration
+        ci/azure-pipelines/build.sh
       displayName: 'Build'