DEBUG appveyor 2

boostorg · Dec 16, 2024 · 80d00e2 · 80d00e2
1 parent a2d660f
commit 80d00e2
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 93 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -38,65 +38,18 @@ environment:
     B2_VARIANT: release,debug
 
   matrix:
-    - FLAVOR: Visual Studio 2008, 2010, 2012
+    - FLAVOR: mingw64 6 (32-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
-      B2_ADDRESS_MODEL: 32 # No 64bit support
-
-    - FLAVOR: Visual Studio 2013, 2015
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-12.0,msvc-14.0
-
-    - FLAVOR: Visual Studio 2017 C++14/17
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_CXXSTD: 14,17
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: Visual Studio 2017 C++2a Strict
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_CXXFLAGS: -permissive-
-      B2_CXXSTD: 2a
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: Visual Studio 2019
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_CXXFLAGS: -permissive-
-      B2_CXXSTD: 14,17,2a
-      B2_TOOLSET: msvc-14.2
-
-    - FLAVOR: Visual Studio 2022
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-      B2_CXXFLAGS: -permissive-
-      B2_CXXSTD: 14,17,20
-      B2_TOOLSET: msvc-14.3
-
-    - FLAVOR: clang-cl
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: 64
-      B2_CXXSTD: 11,14,17
-      B2_TOOLSET: clang-win
-
-    - FLAVOR: cygwin (32-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin\bin;
+      ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1
       B2_ADDRESS_MODEL: 32
-      B2_CXXSTD: 03,11,14,1z
+      B2_CXXSTD: 11
       B2_TOOLSET: gcc
 
-    - FLAVOR: cygwin (64-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: 64
-      B2_CXXSTD: 03,11,14,1z
-      B2_TOOLSET: gcc
-
-    # (Currently) the images up to 2017 use an older Cygwin
-    # This tests that the library works with more recent versions
-    - FLAVOR: cygwin (64-bit, latest)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-      ADDPATH: C:\cygwin64\bin;
+    - FLAVOR: mingw64 6 (64-bit)
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1
       B2_ADDRESS_MODEL: 64
-      B2_CXXSTD: 03,11,14,1z
+      B2_CXXSTD: 11
       B2_TOOLSET: gcc
 
     - FLAVOR: mingw64 (32-bit)
@@ -113,44 +66,6 @@ environment:
       B2_CXXSTD: 03,11,14,17,2a
       B2_TOOLSET: gcc
 
-    - FLAVOR: CodeCov (VS 2019)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_CXXFLAGS: -permissive-
-      B2_CXXSTD: 14
-      B2_TOOLSET: msvc-14.2
-      B2_FLAGS: --nowide-enable-cmake
-      B2_ADDRESS_MODEL: 64
-      B2_LINK: static
-      B2_JOBS: 1
-      COVERAGE: true
-
-    # CMake builds using preinstalled Boost
-    - CMAKE: true
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CXXSTD: 14
-      GENERATOR: Visual Studio 14 2015 Win64
-      configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_60_0
-    - CMAKE: true
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
-      CXXSTD: 17
-      # This test sometimes fails on recent images when using CMake
-      CMAKE_FLAGS: -DBOOST_NOWIDE_DISABLE_CIN_TEST=ON
-      GENERATOR: Visual Studio 17 2022
-      configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_83_0
-
-    # Coverity
-    - COVERITY: true
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      GENERATOR: Visual Studio 16 2019
-      configuration: Debug
-      BOOST_ROOT: C:\Libraries\boost_1_85_0
-      COVERITY_SCAN_TOKEN:
-        secure: FzhGUr+AR/VOBGUta7dDLMDruolChnvyMSvsM/zLvPY=
-      COVERITY_SCAN_NOTIFICATION_EMAIL:
-        secure: Qq4PZ3QlpYtg3HEyn9r2Og==
-
 install:
   - git clone --depth 1 https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
   # Copy ci folder if not testing Boost.CI
@@ -160,7 +75,7 @@ install:
 
 build: off
 
-test_script: ci\build.bat
+test_script: ci\run.bat
 
 for:
   # CodeCov coverage build

diff --git a/ci/run.bat b/ci/run.bat
@@ -0,0 +1,45 @@
+@ECHO OFF
+setlocal enabledelayedexpansion
+
+IF NOT DEFINED B2_CI_VERSION (
+    echo You need to set B2_CI_VERSION in your CI script
+    exit /B 1
+)
+
+IF DEFINED ADDPATH (SET "PATH=%ADDPATH%%PATH%")
+
+echo | c++ -std=c++11 -dM -E -
+
+SET B2_TOOLCXX=toolset=%B2_TOOLSET%
+
+IF DEFINED B2_CXXSTD (SET B2_CXXSTD=cxxstd=%B2_CXXSTD%)
+IF DEFINED B2_CXXFLAGS (SET B2_CXXFLAGS=cxxflags=%B2_CXXFLAGS%)
+IF DEFINED B2_DEFINES (SET B2_DEFINES=define=%B2_DEFINES%)
+IF DEFINED B2_INCLUDE (SET B2_INCLUDE=include=%B2_INCLUDE%)
+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%)
+
+set SELF_S=%SELF:\=/%
+IF NOT DEFINED B2_TARGETS (SET B2_TARGETS=libs/!SELF_S!/test)
+IF NOT DEFINED B2_JOBS (SET B2_JOBS=3)
+
+REM clang-win requires to use the linker for the manifest
+IF "%B2_TOOLSET%" == "clang-win" (
+    IF NOT DEFINED B2_FLAGS (
+        SET B2_FLAGS=embed-manifest-via=linker
+    ) ELSE (
+        SET B2_FLAGS=embed-manifest-via=linker %B2_FLAGS%
+    )
+)
+
+cd %BOOST_ROOT%
+
+IF DEFINED SCRIPT (
+    call libs\%SELF%\%SCRIPT%
+) ELSE (
+    REM Echo the complete build command to the build log
+    ECHO b2 --abbreviate-paths %B2_TARGETS% %B2_TOOLCXX% %B2_CXXSTD% %B2_CXXFLAGS% %B2_DEFINES% %B2_INCLUDE% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_VARIANT% -j%B2_JOBS% %B2_FLAGS%
+    REM Now go build...
+    b2 --abbreviate-paths %B2_TARGETS% %B2_TOOLCXX% %B2_CXXSTD% %B2_CXXFLAGS% %B2_DEFINES% %B2_INCLUDE% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_VARIANT% -j%B2_JOBS% %B2_FLAGS%
+)