From 22bb550f49cd91dc9eec69fab35a4b7485485009 Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Thu, 5 Aug 2021 15:40:19 +0200 Subject: Removed the 'shortened' profile names in favor of descriptive profile class names --- build/appveyor/CYGW-appveyor-build.bat | 35 ------------------ build/appveyor/CYGW-appveyor-install.bat | 35 ------------------ build/appveyor/CYGW-appveyor-test.bat | 21 ----------- build/appveyor/CYGWIN-appveyor-build.bat | 35 ++++++++++++++++++ build/appveyor/CYGWIN-appveyor-install.bat | 35 ++++++++++++++++++ build/appveyor/CYGWIN-appveyor-test.bat | 21 +++++++++++ build/appveyor/MING-appveyor-build.bat | 34 ----------------- build/appveyor/MING-appveyor-install.bat | 59 ------------------------------ build/appveyor/MING-appveyor-test.bat | 22 ----------- build/appveyor/MINGW-appveyor-build.bat | 34 +++++++++++++++++ build/appveyor/MINGW-appveyor-install.bat | 59 ++++++++++++++++++++++++++++++ build/appveyor/MINGW-appveyor-test.bat | 22 +++++++++++ build/appveyor/simulate-appveyor.bat | 6 +-- build/appveyor/win_setcompiler.bat | 2 +- build/appveyor/win_setenv.bat | 6 +-- build/appveyor/win_setgenerator.bat | 8 ++-- build/appveyor/win_showenv.bat | 4 +- 17 files changed, 219 insertions(+), 219 deletions(-) delete mode 100644 build/appveyor/CYGW-appveyor-build.bat delete mode 100644 build/appveyor/CYGW-appveyor-install.bat delete mode 100644 build/appveyor/CYGW-appveyor-test.bat create mode 100644 build/appveyor/CYGWIN-appveyor-build.bat create mode 100644 build/appveyor/CYGWIN-appveyor-install.bat create mode 100644 build/appveyor/CYGWIN-appveyor-test.bat delete mode 100644 build/appveyor/MING-appveyor-build.bat delete mode 100644 build/appveyor/MING-appveyor-install.bat delete mode 100644 build/appveyor/MING-appveyor-test.bat create mode 100644 build/appveyor/MINGW-appveyor-build.bat create mode 100644 build/appveyor/MINGW-appveyor-install.bat create mode 100644 build/appveyor/MINGW-appveyor-test.bat (limited to 'build') diff --git a/build/appveyor/CYGW-appveyor-build.bat b/build/appveyor/CYGW-appveyor-build.bat deleted file mode 100644 index edac6b6dc..000000000 --- a/build/appveyor/CYGW-appveyor-build.bat +++ /dev/null @@ -1,35 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -CD build\appveyor || EXIT /B -CALL win_banner_build.bat || EXIT /B -CALL win_setenv.bat || EXIT /B - -SET CMAKEARGS=^ - -G'%GENERATOR%' ^ - -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ - -DCMAKE_INSTALL_PREFIX=%INSTDIR% ^ - -DCMAKE_CXX_FLAGS="-D_GNU_SOURCE" ^ - -DWITH_JAVA=OFF ^ - -DWITH_PYTHON=OFF - -:: -DCMAKE_CXX_EXTENSIONS=ON ^ -:: -DCMAKE_CXX_STANDARD=11 ^ - -@ECHO ON -%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B -@ECHO OFF diff --git a/build/appveyor/CYGW-appveyor-install.bat b/build/appveyor/CYGW-appveyor-install.bat deleted file mode 100644 index 9971c8ed0..000000000 --- a/build/appveyor/CYGW-appveyor-install.bat +++ /dev/null @@ -1,35 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -:: -:: Appveyor install script for CYGWIN -:: Installs third party packages we need for a cmake build -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -CD build\appveyor || EXIT /B -CALL win_banner_install.bat || EXIT /B -CALL win_setenv.bat || EXIT /B -CALL win_showenv.bat || EXIT /B - -:: -:: Install apt-cyg for package management because its easier to use -:: than Cygwins setup.exe. But both are possible to use. -:: - -%BASH% -lc "wget https://rawgit.com/transcode-open/apt-cyg/master/apt-cyg && install apt-cyg /bin && rm -f apt-cyg" || EXIT /B -%BASH% -lc "apt-cyg update" || EXIT /B -%BASH% -lc "apt-cyg install unzip xz cmake make bison flex gcc-g++ libboost-devel libevent-devel openssl-devel zlib-devel" || EXIT /B diff --git a/build/appveyor/CYGW-appveyor-test.bat b/build/appveyor/CYGW-appveyor-test.bat deleted file mode 100644 index 9a1d75f55..000000000 --- a/build/appveyor/CYGW-appveyor-test.bat +++ /dev/null @@ -1,21 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion -CD build\appveyor || EXIT /B -CALL win_banner_test.bat || EXIT /B -CALL win_setenv.bat || EXIT /B - -%BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B diff --git a/build/appveyor/CYGWIN-appveyor-build.bat b/build/appveyor/CYGWIN-appveyor-build.bat new file mode 100644 index 000000000..edac6b6dc --- /dev/null +++ b/build/appveyor/CYGWIN-appveyor-build.bat @@ -0,0 +1,35 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +CD build\appveyor || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B + +SET CMAKEARGS=^ + -G'%GENERATOR%' ^ + -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ + -DCMAKE_INSTALL_PREFIX=%INSTDIR% ^ + -DCMAKE_CXX_FLAGS="-D_GNU_SOURCE" ^ + -DWITH_JAVA=OFF ^ + -DWITH_PYTHON=OFF + +:: -DCMAKE_CXX_EXTENSIONS=ON ^ +:: -DCMAKE_CXX_STANDARD=11 ^ + +@ECHO ON +%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B +@ECHO OFF diff --git a/build/appveyor/CYGWIN-appveyor-install.bat b/build/appveyor/CYGWIN-appveyor-install.bat new file mode 100644 index 000000000..9971c8ed0 --- /dev/null +++ b/build/appveyor/CYGWIN-appveyor-install.bat @@ -0,0 +1,35 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +:: +:: Appveyor install script for CYGWIN +:: Installs third party packages we need for a cmake build +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +CD build\appveyor || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B + +:: +:: Install apt-cyg for package management because its easier to use +:: than Cygwins setup.exe. But both are possible to use. +:: + +%BASH% -lc "wget https://rawgit.com/transcode-open/apt-cyg/master/apt-cyg && install apt-cyg /bin && rm -f apt-cyg" || EXIT /B +%BASH% -lc "apt-cyg update" || EXIT /B +%BASH% -lc "apt-cyg install unzip xz cmake make bison flex gcc-g++ libboost-devel libevent-devel openssl-devel zlib-devel" || EXIT /B diff --git a/build/appveyor/CYGWIN-appveyor-test.bat b/build/appveyor/CYGWIN-appveyor-test.bat new file mode 100644 index 000000000..9a1d75f55 --- /dev/null +++ b/build/appveyor/CYGWIN-appveyor-test.bat @@ -0,0 +1,21 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion +CD build\appveyor || EXIT /B +CALL win_banner_test.bat || EXIT /B +CALL win_setenv.bat || EXIT /B + +%BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B diff --git a/build/appveyor/MING-appveyor-build.bat b/build/appveyor/MING-appveyor-build.bat deleted file mode 100644 index 59f690c48..000000000 --- a/build/appveyor/MING-appveyor-build.bat +++ /dev/null @@ -1,34 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -CD build\appveyor || EXIT /B -CALL win_banner_build.bat || EXIT /B -CALL win_setenv.bat || EXIT /B - -SET CMAKEARGS=^ - -G'%GENERATOR%' ^ - -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ - -DCMAKE_INSTALL_PREFIX=%INSTDIR% ^ - -DCMAKE_MAKE_PROGRAM=/mingw%NORM_PLATFORM%/bin/mingw32-make ^ - -DCMAKE_C_COMPILER=/mingw%NORM_PLATFORM%/bin/gcc.exe ^ - -DCMAKE_CXX_COMPILER=/mingw%NORM_PLATFORM%/bin/g++.exe ^ - -DOPENSSL_ROOT_DIR=/mingw%NORM_PLATFORM% ^ - -DWITH_PYTHON=OFF - -@ECHO ON -%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B -@ECHO OFF diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat deleted file mode 100644 index 5b8a2d878..000000000 --- a/build/appveyor/MING-appveyor-install.bat +++ /dev/null @@ -1,59 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -:: -:: Appveyor install script for MINGW on MSYS2 -:: Installs third party packages we need for a cmake build -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -CD build\appveyor || EXIT /B -CALL win_banner_install.bat || EXIT /B -CALL win_setenv.bat || EXIT /B -CALL win_showenv.bat || EXIT /B - -SET PACKAGES=^ - base-devel ^ - mingw-w64-x86_64-toolchain ^ - bison ^ - flex ^ - make ^ - mingw-w64-%MINGWPLAT%-boost ^ - mingw-w64-%MINGWPLAT%-cmake ^ - mingw-w64-%MINGWPLAT%-libevent ^ - mingw-w64-%MINGWPLAT%-openssl ^ - mingw-w64-%MINGWPLAT%-toolchain ^ - mingw-w64-%MINGWPLAT%-zlib - -::mingw-w64-%MINGWPLAT%-qt5 : WAY too large (1GB download!) - tested in cygwin builds anyway - -:: Upgrade things -%BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B -%BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B -%BASH% -lc "pacman --noconfirm --needed -S %PACKAGES%" || EXIT /B - - -:: These instructions are for a manual update of specific package versions. -:: Fall back to this in case the above does not work anymore (broken upstream). -:::: Updata the new key -::%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.xz" || EXIT /B -::%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.xz.sig" || EXIT /B -::%BASH% -lc "pacman-key --verify msys2-keyring-1~20210213-2-any.pkg.tar.xz.sig" || EXIT /B -::%BASH% -lc "pacman --noconfirm -U --config <(echo) msys2-keyring-1~20210213-2-any.pkg.tar.xz" || EXIT /B -:::: Upgrade things -::%BASH% -lc "pacman --noconfirm -Sy" || EXIT /B -::%BASH% -lc "pacman --noconfirm -Udd https://repo.msys2.org/msys/x86_64/pacman-5.2.2-5-x86_64.pkg.tar.xz" || EXIT /B -::%BASH% -lc "pacman --noconfirm --needed -S %PACKAGES%" || EXIT /B diff --git a/build/appveyor/MING-appveyor-test.bat b/build/appveyor/MING-appveyor-test.bat deleted file mode 100644 index 3dec76838..000000000 --- a/build/appveyor/MING-appveyor-test.bat +++ /dev/null @@ -1,22 +0,0 @@ -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -CD build\appveyor || EXIT /B -CALL win_banner_test.bat || EXIT /B -CALL win_setenv.bat || EXIT /B - -%BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B diff --git a/build/appveyor/MINGW-appveyor-build.bat b/build/appveyor/MINGW-appveyor-build.bat new file mode 100644 index 000000000..59f690c48 --- /dev/null +++ b/build/appveyor/MINGW-appveyor-build.bat @@ -0,0 +1,34 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +CD build\appveyor || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B + +SET CMAKEARGS=^ + -G'%GENERATOR%' ^ + -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ + -DCMAKE_INSTALL_PREFIX=%INSTDIR% ^ + -DCMAKE_MAKE_PROGRAM=/mingw%NORM_PLATFORM%/bin/mingw32-make ^ + -DCMAKE_C_COMPILER=/mingw%NORM_PLATFORM%/bin/gcc.exe ^ + -DCMAKE_CXX_COMPILER=/mingw%NORM_PLATFORM%/bin/g++.exe ^ + -DOPENSSL_ROOT_DIR=/mingw%NORM_PLATFORM% ^ + -DWITH_PYTHON=OFF + +@ECHO ON +%BASH% -lc "mkdir -p %BUILDDIR% && cd %BUILDDIR% && cmake.exe %SRCDIR% %CMAKEARGS% && cmake --build . --config %CONFIGURATION% --target install" || EXIT /B +@ECHO OFF diff --git a/build/appveyor/MINGW-appveyor-install.bat b/build/appveyor/MINGW-appveyor-install.bat new file mode 100644 index 000000000..5b8a2d878 --- /dev/null +++ b/build/appveyor/MINGW-appveyor-install.bat @@ -0,0 +1,59 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +:: +:: Appveyor install script for MINGW on MSYS2 +:: Installs third party packages we need for a cmake build +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +CD build\appveyor || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B + +SET PACKAGES=^ + base-devel ^ + mingw-w64-x86_64-toolchain ^ + bison ^ + flex ^ + make ^ + mingw-w64-%MINGWPLAT%-boost ^ + mingw-w64-%MINGWPLAT%-cmake ^ + mingw-w64-%MINGWPLAT%-libevent ^ + mingw-w64-%MINGWPLAT%-openssl ^ + mingw-w64-%MINGWPLAT%-toolchain ^ + mingw-w64-%MINGWPLAT%-zlib + +::mingw-w64-%MINGWPLAT%-qt5 : WAY too large (1GB download!) - tested in cygwin builds anyway + +:: Upgrade things +%BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B +%BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B +%BASH% -lc "pacman --noconfirm --needed -S %PACKAGES%" || EXIT /B + + +:: These instructions are for a manual update of specific package versions. +:: Fall back to this in case the above does not work anymore (broken upstream). +:::: Updata the new key +::%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.xz" || EXIT /B +::%BASH% -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-1~20210213-2-any.pkg.tar.xz.sig" || EXIT /B +::%BASH% -lc "pacman-key --verify msys2-keyring-1~20210213-2-any.pkg.tar.xz.sig" || EXIT /B +::%BASH% -lc "pacman --noconfirm -U --config <(echo) msys2-keyring-1~20210213-2-any.pkg.tar.xz" || EXIT /B +:::: Upgrade things +::%BASH% -lc "pacman --noconfirm -Sy" || EXIT /B +::%BASH% -lc "pacman --noconfirm -Udd https://repo.msys2.org/msys/x86_64/pacman-5.2.2-5-x86_64.pkg.tar.xz" || EXIT /B +::%BASH% -lc "pacman --noconfirm --needed -S %PACKAGES%" || EXIT /B diff --git a/build/appveyor/MINGW-appveyor-test.bat b/build/appveyor/MINGW-appveyor-test.bat new file mode 100644 index 000000000..3dec76838 --- /dev/null +++ b/build/appveyor/MINGW-appveyor-test.bat @@ -0,0 +1,22 @@ +:: +:: Licensed under the Apache License, Version 2.0 (the "License"); +:: you may not use this file except in compliance with the License. +:: You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +CD build\appveyor || EXIT /B +CALL win_banner_test.bat || EXIT /B +CALL win_setenv.bat || EXIT /B + +%BASH% -lc "cd %BUILDDIR% && ctest.exe -C %CONFIGURATION% --timeout 300 -VV -E '%DISABLED_TESTS%'" || EXIT /B 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 ------------------------------------------------------------------------------- -- cgit v1.2.1