diff options
-rwxr-xr-x | appveyor.yml | 10 | ||||
-rw-r--r-- | build/appveyor/CYGWIN-appveyor-build.bat (renamed from build/appveyor/CYGW-appveyor-build.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/CYGWIN-appveyor-install.bat (renamed from build/appveyor/CYGW-appveyor-install.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/CYGWIN-appveyor-test.bat (renamed from build/appveyor/CYGW-appveyor-test.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/MINGW-appveyor-build.bat (renamed from build/appveyor/MING-appveyor-build.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/MINGW-appveyor-install.bat (renamed from build/appveyor/MING-appveyor-install.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/MINGW-appveyor-test.bat (renamed from build/appveyor/MING-appveyor-test.bat) | 0 | ||||
-rw-r--r-- | build/appveyor/simulate-appveyor.bat | 6 | ||||
-rw-r--r-- | build/appveyor/win_setcompiler.bat | 2 | ||||
-rw-r--r-- | build/appveyor/win_setenv.bat | 6 | ||||
-rw-r--r-- | build/appveyor/win_setgenerator.bat | 8 | ||||
-rw-r--r-- | build/appveyor/win_showenv.bat | 4 |
12 files changed, 20 insertions, 16 deletions
diff --git a/appveyor.yml b/appveyor.yml index 7a0a3d911..7c2801a43 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,6 +34,7 @@ matrix: environment: matrix: - PROFILE: MSVC2017 + PROFILE_CLASS: MSVC APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 PLATFORM: x64 CONFIGURATION: Release @@ -45,6 +46,7 @@ environment: ZLIB_VERSION: 1.2.11 - PROFILE: MSVC2015 + PROFILE_CLASS: MSVC APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 PLATFORM: x86 CONFIGURATION: Debug @@ -56,6 +58,7 @@ environment: ZLIB_VERSION: 1.2.8 - PROFILE: MINGW + PROFILE_CLASS: MINGW # Currently the the latest MSYS2 is in the following image: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PLATFORM: x64 @@ -63,22 +66,23 @@ environment: DISABLED_TESTS: (StalenessCheckTest) #- PROFILE: CYGWIN + # PROFILE_CLASS: CYGWIN # PLATFORM: x64 # CONFIGURATION: RelWithDebInfo # DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest) install: - cd %APPVEYOR_BUILD_FOLDER% - - call build\appveyor\%PROFILE:~0,4%-appveyor-install.bat + - call build\appveyor\%PROFILE_CLASS%-appveyor-install.bat - refreshenv build_script: - cd %APPVEYOR_BUILD_FOLDER% - - call build\appveyor\%PROFILE:~0,4%-appveyor-build.bat + - call build\appveyor\%PROFILE_CLASS%-appveyor-build.bat test_script: - cd %APPVEYOR_BUILD_FOLDER% - - call build\appveyor\%PROFILE:~0,4%-appveyor-test.bat + - call build\appveyor\%PROFILE_CLASS%-appveyor-test.bat # artifact capture disabled as it might increase service cost for little gain: diff --git a/build/appveyor/CYGW-appveyor-build.bat b/build/appveyor/CYGWIN-appveyor-build.bat index edac6b6dc..edac6b6dc 100644 --- a/build/appveyor/CYGW-appveyor-build.bat +++ b/build/appveyor/CYGWIN-appveyor-build.bat diff --git a/build/appveyor/CYGW-appveyor-install.bat b/build/appveyor/CYGWIN-appveyor-install.bat index 9971c8ed0..9971c8ed0 100644 --- a/build/appveyor/CYGW-appveyor-install.bat +++ b/build/appveyor/CYGWIN-appveyor-install.bat diff --git a/build/appveyor/CYGW-appveyor-test.bat b/build/appveyor/CYGWIN-appveyor-test.bat index 9a1d75f55..9a1d75f55 100644 --- a/build/appveyor/CYGW-appveyor-test.bat +++ b/build/appveyor/CYGWIN-appveyor-test.bat diff --git a/build/appveyor/MING-appveyor-build.bat b/build/appveyor/MINGW-appveyor-build.bat index 59f690c48..59f690c48 100644 --- a/build/appveyor/MING-appveyor-build.bat +++ b/build/appveyor/MINGW-appveyor-build.bat diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MINGW-appveyor-install.bat index 5b8a2d878..5b8a2d878 100644 --- a/build/appveyor/MING-appveyor-install.bat +++ b/build/appveyor/MINGW-appveyor-install.bat diff --git a/build/appveyor/MING-appveyor-test.bat b/build/appveyor/MINGW-appveyor-test.bat index 3dec76838..3dec76838 100644 --- a/build/appveyor/MING-appveyor-test.bat +++ b/build/appveyor/MINGW-appveyor-test.bat diff --git a/build/appveyor/simulate-appveyor.bat b/build/appveyor/simulate-appveyor.bat index 6af0aa625..ac229b1ff 100644 --- a/build/appveyor/simulate-appveyor.bat +++ b/build/appveyor/simulate-appveyor.bat @@ -28,8 +28,8 @@ SET PLATFORM=%2 SET PROFILE=%3 CD %APPVEYOR_BUILD_FOLDER% -CALL build\appveyor\%PROFILE:~0,4%-appveyor-install.bat || EXIT /B +CALL build\appveyor\%PROFILE_CLASS%-appveyor-install.bat || EXIT /B CD %APPVEYOR_BUILD_FOLDER% -CALL build\appveyor\%PROFILE:~0,4%-appveyor-build.bat || EXIT /B +CALL build\appveyor\%PROFILE_CLASS%-appveyor-build.bat || EXIT /B CD %APPVEYOR_BUILD_FOLDER% -CALL build\appveyor\%PROFILE:~0,4%-appveyor-test.bat +CALL build\appveyor\%PROFILE_CLASS%-appveyor-test.bat diff --git a/build/appveyor/win_setcompiler.bat b/build/appveyor/win_setcompiler.bat index a3eb90cd0..d498f415d 100644 --- a/build/appveyor/win_setcompiler.bat +++ b/build/appveyor/win_setcompiler.bat @@ -35,7 +35,7 @@ IF DEFINED COMPILER ( EXIT /B 0 ) -IF NOT "%PROFILE:~0,4%" == "MSVC" ( +IF NOT "%PROFILE_CLASS%" == "MSVC" ( SET COMPILER=gcc ) ELSE ( CALL :CHECK 16 diff --git a/build/appveyor/win_setenv.bat b/build/appveyor/win_setenv.bat index b250e6b01..ef664d17a 100644 --- a/build/appveyor/win_setenv.bat +++ b/build/appveyor/win_setenv.bat @@ -65,7 +65,7 @@ SET INSTDIR=%APPVEYOR_BUILD_FOLDER%\..\install\%PROFILE%\%PLATFORM% SET SRCDIR=%APPVEYOR_BUILD_FOLDER% -IF "%PROFILE:~0,4%" == "MSVC" ( +IF "%PROFILE_CLASS%" == "MSVC" ( :: FindBoost needs forward slashes so cmake doesn't see something as an escaped character SET BOOST_ROOT=C:/Libraries/boost_%BOOST_VERSION:.=_% @@ -87,7 +87,7 @@ IF "%PROFILE:~0,4%" == "MSVC" ( SET PATH=C:\Qt\%QT_VERSION%\%PROFILE%!QTEXT!\bin;!PATH! ) -) ELSE IF "%PROFILE:~0,4%" == "MING" ( +) ELSE IF "%PROFILE_CLASS%" == "MINGW" ( :: PLATFORM = x86 means MINGWPLAT i686 :: PLATFORM = x64 means MINGWPLAT x86_64 @@ -107,7 +107,7 @@ IF "%PROFILE:~0,4%" == "MSVC" ( SET SRCDIR=%SRCDIR:\=/% SET SRCDIR=/c!SRCDIR:~2! -) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( +) ELSE IF "%PROFILE_CLASS%" == "CYGWIN" ( IF "%PLATFORM%" == "x64" ( SET CYGWINROOT=C:\cygwin64 diff --git a/build/appveyor/win_setgenerator.bat b/build/appveyor/win_setgenerator.bat index 5f95058d0..818155b93 100644 --- a/build/appveyor/win_setgenerator.bat +++ b/build/appveyor/win_setgenerator.bat @@ -40,13 +40,13 @@ IF DEFINED GENERATOR ( ECHO [warn ] using existing environment variable GENERATOR -) ELSE IF "%PROFILE:~0,4%" == "MING" ( +) ELSE IF "%PROFILE_CLASS%" == "MINGW" ( SET GENERATOR=MinGW Makefiles -) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( +) ELSE IF "%PROFILE_CLASS%" == "CYGWIN" ( SET GENERATOR=Unix Makefiles -) ELSE IF "%PROFILE:~0,4%" == "MSYS" ( +) ELSE IF "%PROFILE_CLASS%" == "MSYS" ( SET GENERATOR=MSYS Makefiles -) ELSE IF "%PROFILE:~0,4%" == "MSVC" ( +) ELSE IF "%PROFILE_CLASS%" == "MSVC" ( IF /i "%PLATFORM%" == "x64" SET GENARCH= Win64 IF "%PROFILE%" == "MSVC2015" ( SET GENERATOR=Visual Studio 14 2015!GENARCH! diff --git a/build/appveyor/win_showenv.bat b/build/appveyor/win_showenv.bat index a70a4906a..51bf2c039 100644 --- a/build/appveyor/win_showenv.bat +++ b/build/appveyor/win_showenv.bat @@ -14,7 +14,7 @@ ECHO/ ECHO =============================================================================== -IF "%PROFILE:~0,4%" == "MSVC" ( +IF "%PROFILE_CLASS%" == "MSVC" ( ECHO Versions ECHO ------------------------------------------------------------------------------- ECHO boost = %BOOST_VERSION% @@ -49,7 +49,7 @@ ECHO SRCDIR = %SRCDIR% ECHO WIN3P = %WIN3P% ECHO WITH_PYTHON = %WITH_PYTHON% ECHO ZLIB_STATIC_SUFFIX = %ZLIB_STATIC_SUFFIX% -IF NOT "%PROFILE:~0,4%" == "MSVC" ( +IF NOT "%PROFILE_CLASS%" == "MSVC" ( ECHO/ ECHO UNIXy PATH ECHO ------------------------------------------------------------------------------- |