From 9e3ac856eef29d0317b8aaec8c3ae810a14a2108 Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Thu, 5 Aug 2021 12:42:21 +0200 Subject: Renamed Windows build files from cl-prefix to win-prefix --- build/appveyor/CYGW-appveyor-build.bat | 4 +- build/appveyor/CYGW-appveyor-install.bat | 6 +- build/appveyor/CYGW-appveyor-test.bat | 4 +- build/appveyor/MING-appveyor-build.bat | 4 +- build/appveyor/MING-appveyor-install.bat | 6 +- build/appveyor/MING-appveyor-test.bat | 4 +- build/appveyor/MSVC-appveyor-build.bat | 4 +- build/appveyor/MSVC-appveyor-install.bat | 8 +- build/appveyor/MSVC-appveyor-test.bat | 4 +- build/appveyor/MSYS-appveyor-build.bat | 4 +- build/appveyor/MSYS-appveyor-install.bat | 7 +- build/appveyor/MSYS-appveyor-test.bat | 4 +- build/appveyor/cl_banner_apache_thrift.bat | 24 ------ build/appveyor/cl_banner_build.bat | 23 ------ build/appveyor/cl_banner_install.bat | 23 ------ build/appveyor/cl_banner_test.bat | 23 ------ build/appveyor/cl_setcompiler.bat | 63 --------------- build/appveyor/cl_setenv.bat | 122 ----------------------------- build/appveyor/cl_setgenerator.bat | 79 ------------------- build/appveyor/cl_showenv.bat | 63 --------------- build/appveyor/win_banner_build.bat | 23 ++++++ build/appveyor/win_banner_install.bat | 23 ++++++ build/appveyor/win_banner_test.bat | 23 ++++++ build/appveyor/win_setcompiler.bat | 63 +++++++++++++++ build/appveyor/win_setenv.bat | 122 +++++++++++++++++++++++++++++ build/appveyor/win_setgenerator.bat | 79 +++++++++++++++++++ build/appveyor/win_showenv.bat | 63 +++++++++++++++ 27 files changed, 425 insertions(+), 450 deletions(-) delete mode 100644 build/appveyor/cl_banner_apache_thrift.bat delete mode 100644 build/appveyor/cl_banner_build.bat delete mode 100644 build/appveyor/cl_banner_install.bat delete mode 100644 build/appveyor/cl_banner_test.bat delete mode 100644 build/appveyor/cl_setcompiler.bat delete mode 100644 build/appveyor/cl_setenv.bat delete mode 100644 build/appveyor/cl_setgenerator.bat delete mode 100644 build/appveyor/cl_showenv.bat create mode 100644 build/appveyor/win_banner_build.bat create mode 100644 build/appveyor/win_banner_install.bat create mode 100644 build/appveyor/win_banner_test.bat create mode 100644 build/appveyor/win_setcompiler.bat create mode 100644 build/appveyor/win_setenv.bat create mode 100644 build/appveyor/win_setgenerator.bat create mode 100644 build/appveyor/win_showenv.bat (limited to 'build') diff --git a/build/appveyor/CYGW-appveyor-build.bat b/build/appveyor/CYGW-appveyor-build.bat index 7749176e8..edac6b6dc 100644 --- a/build/appveyor/CYGW-appveyor-build.bat +++ b/build/appveyor/CYGW-appveyor-build.bat @@ -16,8 +16,8 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_build.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B SET CMAKEARGS=^ -G'%GENERATOR%' ^ diff --git a/build/appveyor/CYGW-appveyor-install.bat b/build/appveyor/CYGW-appveyor-install.bat index 5ef4abac6..c30ccfc40 100644 --- a/build/appveyor/CYGW-appveyor-install.bat +++ b/build/appveyor/CYGW-appveyor-install.bat @@ -21,9 +21,9 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_install.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B -CALL cl_showenv.bat || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B :: :: Upgrades cygwin to the latest, if you want... diff --git a/build/appveyor/CYGW-appveyor-test.bat b/build/appveyor/CYGW-appveyor-test.bat index 5b0d0d22e..9a1d75f55 100644 --- a/build/appveyor/CYGW-appveyor-test.bat +++ b/build/appveyor/CYGW-appveyor-test.bat @@ -15,7 +15,7 @@ @ECHO OFF SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_test.bat || EXIT /B -CALL cl_setenv.bat || 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 index 3e24b11d7..59f690c48 100644 --- a/build/appveyor/MING-appveyor-build.bat +++ b/build/appveyor/MING-appveyor-build.bat @@ -16,8 +16,8 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_build.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B SET CMAKEARGS=^ -G'%GENERATOR%' ^ diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat index 862cb1c05..cd06be364 100644 --- a/build/appveyor/MING-appveyor-install.bat +++ b/build/appveyor/MING-appveyor-install.bat @@ -21,9 +21,9 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_install.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B -CALL cl_showenv.bat || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B SET PACKAGES=^ --needed -S bison flex make ^ diff --git a/build/appveyor/MING-appveyor-test.bat b/build/appveyor/MING-appveyor-test.bat index ba69a113c..3dec76838 100644 --- a/build/appveyor/MING-appveyor-test.bat +++ b/build/appveyor/MING-appveyor-test.bat @@ -16,7 +16,7 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_test.bat || EXIT /B -CALL cl_setenv.bat || 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/MSVC-appveyor-build.bat b/build/appveyor/MSVC-appveyor-build.bat index 79c4b0344..e0fc5ed60 100644 --- a/build/appveyor/MSVC-appveyor-build.bat +++ b/build/appveyor/MSVC-appveyor-build.bat @@ -16,8 +16,8 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_build.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B MKDIR "%BUILDDIR%" || EXIT /B CD "%BUILDDIR%" || EXIT /B diff --git a/build/appveyor/MSVC-appveyor-install.bat b/build/appveyor/MSVC-appveyor-install.bat index 3b4cd8e94..509b3469a 100644 --- a/build/appveyor/MSVC-appveyor-install.bat +++ b/build/appveyor/MSVC-appveyor-install.bat @@ -21,9 +21,9 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_install.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B -CALL cl_showenv.bat || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B MKDIR "%WIN3P%" || EXIT /B choco feature enable -n allowGlobalConfirmation || EXIT /B @@ -48,7 +48,7 @@ call build-zlib.bat || EXIT /B CD "%APPVEYOR_SCRIPTS%" || EXIT /B call build-libevent.bat || EXIT /B -:: python packages (correct path to pip set in cl_setenv.bat) +:: python packages (correct path to pip set in win_setenv.bat) pip.exe ^ install backports.ssl_match_hostname ^ ipaddress ^ diff --git a/build/appveyor/MSVC-appveyor-test.bat b/build/appveyor/MSVC-appveyor-test.bat index a340f89f7..39a10f89f 100644 --- a/build/appveyor/MSVC-appveyor-test.bat +++ b/build/appveyor/MSVC-appveyor-test.bat @@ -15,8 +15,8 @@ @ECHO ON SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_test.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_test.bat || EXIT /B +CALL win_setenv.bat || EXIT /B CD "%BUILDDIR%" || EXIT /B DIR C:\libraries diff --git a/build/appveyor/MSYS-appveyor-build.bat b/build/appveyor/MSYS-appveyor-build.bat index 814a62497..95b7669bd 100644 --- a/build/appveyor/MSYS-appveyor-build.bat +++ b/build/appveyor/MSYS-appveyor-build.bat @@ -16,8 +16,8 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_build.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_build.bat || EXIT /B +CALL win_setenv.bat || EXIT /B SET BASH=C:\msys64\usr\bin\bash SET CMAKE=/c/msys64/mingw64/bin/cmake.exe diff --git a/build/appveyor/MSYS-appveyor-install.bat b/build/appveyor/MSYS-appveyor-install.bat index a818df305..8f9b94d23 100644 --- a/build/appveyor/MSYS-appveyor-install.bat +++ b/build/appveyor/MSYS-appveyor-install.bat @@ -21,9 +21,9 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_install.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B -CALL cl_showenv.bat || EXIT /B +CALL win_banner_install.bat || EXIT /B +CALL win_setenv.bat || EXIT /B +CALL win_showenv.bat || EXIT /B :: We're going to keep boost at a version cmake understands SET BOOSTPKG=mingw-w64-x86_64-boost-1.64.0-3-any.pkg.tar.xz @@ -45,4 +45,3 @@ SET PACKAGES=^ :: does not have built-in dependencies for boost 1.66.0 yet :: -- this cuts down on build warning output -- %BASH% -lc "wget http://repo.msys2.org/mingw/x86_64/%BOOSTPKG% && pacman --noconfirm --needed -U %BOOSTPKG% && rm %BOOSTPKG%" || EXIT /B - diff --git a/build/appveyor/MSYS-appveyor-test.bat b/build/appveyor/MSYS-appveyor-test.bat index 45bb39061..0cc3f76d3 100644 --- a/build/appveyor/MSYS-appveyor-test.bat +++ b/build/appveyor/MSYS-appveyor-test.bat @@ -16,8 +16,8 @@ SETLOCAL EnableDelayedExpansion CD build\appveyor || EXIT /B -CALL cl_banner_test.bat || EXIT /B -CALL cl_setenv.bat || EXIT /B +CALL win_banner_test.bat || EXIT /B +CALL win_setenv.bat || EXIT /B CD "%BUILDDIR%" || EXIT /B :: randomly fails on mingw; see Jira THRIFT-4106 diff --git a/build/appveyor/cl_banner_apache_thrift.bat b/build/appveyor/cl_banner_apache_thrift.bat deleted file mode 100644 index 78f2a2aab..000000000 --- a/build/appveyor/cl_banner_apache_thrift.bat +++ /dev/null @@ -1,24 +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. -:: - -:: A visual indicator in a large log helps you locate things when scanning -:: http://www.patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Apache%20Thrift - -ECHO/ -ECHO ___ __ ________ _ _____ -ECHO / _ | ___ ___ _____/ / ___ /_ __/ / ____(_) _/ /_ -ECHO / __ |/ _ \/ _ `/ __/ _ \/ -_) / / / _ \/ __/ / _/ __/ -ECHO /_/ |_/ .__/\_,_/\__/_//_/\__/ /_/ /_//_/_/ /_/_/ \__/ -ECHO /_/ -ECHO/ diff --git a/build/appveyor/cl_banner_build.bat b/build/appveyor/cl_banner_build.bat deleted file mode 100644 index 60272f335..000000000 --- a/build/appveyor/cl_banner_build.bat +++ /dev/null @@ -1,23 +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. -:: - -:: A visual indicator in a large log helps you locate things when scanning -:: http://www.patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Build - -ECHO/ -ECHO ___ _ __ __ -ECHO / _ )__ __(_) /__/ / -ECHO / _ / // / / / _ / @@@ BUILD -ECHO /____/\_,_/_/_/\_,_/ -ECHO/ diff --git a/build/appveyor/cl_banner_install.bat b/build/appveyor/cl_banner_install.bat deleted file mode 100644 index fde3da21a..000000000 --- a/build/appveyor/cl_banner_install.bat +++ /dev/null @@ -1,23 +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. -:: - -:: A visual indicator in a large log helps you locate things when scanning -:: http://www.patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Install - -ECHO/ -ECHO ____ __ ____ -ECHO / _/__ ___ / /____ _/ / / -ECHO _/ // _ \(_-^&1 | findstr /C:"Version %1%" > nul -EXIT /B diff --git a/build/appveyor/cl_setenv.bat b/build/appveyor/cl_setenv.bat deleted file mode 100644 index 40cfc73db..000000000 --- a/build/appveyor/cl_setenv.bat +++ /dev/null @@ -1,122 +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 - -IF "%PROFILE%" == "MSVC2012" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" %PLATFORM% -) ELSE IF "%PROFILE%" == "MSVC2013" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM% -) ELSE IF "%PROFILE%" == "MSVC2015" ( - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% -) ELSE IF "%PROFILE%" == "MSVC2017" ( - CALL :SETUPNEWERMSVC || EXIT /B -) ELSE IF "%PROFILE%" == "MINGW" ( - REM Supported, nothing special to do here. -) ELSE IF "%PROFILE%" == "CYGWIN" ( - REM Supported, nothing special to do here. -) ELSE ( - ECHO Unsupported PROFILE=%PROFILE% or PLATFORM=%PLATFORM% - EXIT /B 1 -) - -CALL cl_setcompiler.bat || EXIT /B -CALL cl_setgenerator.bat || EXIT /B - -SET APPVEYOR_SCRIPTS=%APPVEYOR_BUILD_FOLDER%\build\appveyor -SET BUILDDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% -SET INSTDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% -SET SRCDIR=%APPVEYOR_BUILD_FOLDER% - -:: PLATFORM is x64 or x86 -:: NORM_PLATFORM is 64 or 32 -SET NORM_PLATFORM=%PLATFORM:~-2,2% -IF "%NORM_PLATFORM%" == "86" (SET NORM_PLATFORM=32) - -IF "%PROFILE:~0,4%" == "MSVC" ( - - :: FindBoost needs forward slashes so cmake doesn't see something as an escaped character - SET BOOST_ROOT=C:/Libraries/boost_%BOOST_VERSION:.=_% - SET BOOST_LIBRARYDIR=!BOOST_ROOT!/lib%NORM_PLATFORM%-msvc-%COMPILER:~-3,2%.%COMPILER:~-1,1% - SET OPENSSL_ROOT=C:\OpenSSL-Win%NORM_PLATFORM% - SET WIN3P=%APPVEYOR_BUILD_FOLDER%\thirdparty - - IF "%PYTHON_VERSION%" == "" ( - SET WITH_PYTHON=OFF - ) ELSE ( - SET WITH_PYTHON=ON - IF /i "%PLATFORM%" == "x64" SET PTEXT=-x64 - SET PATH=C:\Python%PYTHON_VERSION:.=%!PTEXT!\scripts;C:\Python%PYTHON_VERSION:.=%!PTEXT!;!PATH! - ) - IF "%CONFIGURATION%" == "Debug" (SET ZLIB_LIB_SUFFIX=d) - - IF NOT "%QT_VERSION%" == "" ( - IF /i "%PLATFORM%" == "x64" SET QTEXT=_64 - SET PATH=C:\Qt\%QT_VERSION%\%PROFILE%!QTEXT!\bin;!PATH! - ) - -) ELSE IF "%PROFILE:~0,4%" == "MING" ( - - :: PLATFORM = x86 means MINGWPLAT i686 - :: PLATFORM = x64 means MINGWPLAT x86_64 - SET MINGWPLAT=x86_64 - IF "%PLATFORM%" == "x86" (SET MINGWPLAT=i686) - - SET BASH=C:\msys64\usr\bin\bash.exe - !BASH! -lc "sed -i '/export PATH=\/mingw32\/bin/d' ~/.bash_profile && sed -i '/export PATH=\/mingw64\/bin/d' ~/.bash_profile && echo 'export PATH=/mingw%NORM_PLATFORM%/bin:$PATH' >> ~/.bash_profile" || EXIT /B - - SET BUILDDIR=%BUILDDIR:\=/% - SET BUILDDIR=/c!BUILDDIR:~2! - SET INSTDIR=%INSTDIR:\=/% - SET INSTDIR=/c!INSTDIR:~2! - SET SRCDIR=%SRCDIR:\=/% - SET SRCDIR=/c!SRCDIR:~2! - -) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( - - SET CYGWINROOT=C:\cygwin - IF "%PLATFORM%" == "x64" (SET CYGWINROOT=!CYGWINROOT!64) - - SET BASH=!CYGWINROOT!\bin\bash.exe - SET SETUP=!CYGWINROOT!\setup-x86 - IF "%PLATFORM%" == "x64" (SET SETUP=!SETUP!_64) - SET SETUP=!SETUP!.exe - - SET BUILDDIR=%BUILDDIR:\=/% - SET BUILDDIR=/cygdrive/c!BUILDDIR:~2! - SET INSTDIR=%INSTDIR:\=/% - SET INSTDIR_CYG=/cygdrive/c!INSTDIR:~2! - SET SRCDIR=%SRCDIR:\=/% - SET SRCDIR=/cygdrive/c!SRCDIR:~2! - -) - -GOTO :EOF - -:SETUPNEWERMSVC - :: If VsDevCmd.bat has already executed, as is the case in the - :: msvc2017 docker container, skip this... - IF NOT DEFINED VSCMD_VER ( - FOR /F "USEBACKQ TOKENS=*" %%i IN (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[15.0,16.0)" -property installationPath`) DO ( - IF "%MSVCROOT%" == "" (SET MSVCROOT=%%i) - ) - SET MSVCPLAT=x86 - IF "%PLATFORM%" == "x64" (SET MSVCPLAT=amd64) - - SET CURRENTDIR=%CD% - CALL "!MSVCROOT!\Common7\Tools\VsDevCmd.bat" -arch=!MSVCPLAT! || EXIT /B - CD %CURRENTDIR% - EXIT /B - ) -:EOF diff --git a/build/appveyor/cl_setgenerator.bat b/build/appveyor/cl_setgenerator.bat deleted file mode 100644 index 5eb6ff31f..000000000 --- a/build/appveyor/cl_setgenerator.bat +++ /dev/null @@ -1,79 +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. -:: - -:: -:: Detect the compiler edition we're building in and then -:: set the GENERATOR environment variable to one of: -:: -:: Visual Studio 15 2017 [arch] = Generates Visual Studio 2017 project files. -:: Optional [arch] can be "Win64" or "ARM". -:: Visual Studio 14 2015 [arch] = Generates Visual Studio 2015 project files. -:: Optional [arch] can be "Win64" or "ARM". -:: Visual Studio 12 2013 [arch] = Generates Visual Studio 2013 project files. -:: Optional [arch] can be "Win64" or "ARM". -:: Visual Studio 11 2012 [arch] = Generates Visual Studio 2012 project files. -:: Optional [arch] can be "Win64" or "ARM". -:: Visual Studio 10 2010 [arch] = Generates Visual Studio 2010 project files. -:: Optional [arch] can be "Win64" or "IA64". -:: MinGW Makefiles = Generates makefiles for MinGW -:: MSYS Makefiles = Generates makefiles for MSYS -:: Unix Makefiles = Generates makefiles for CYGWIN -:: -:: Honors any existing GENERATOR environment variable -:: setting instead of overwriting it, to allow it -:: to be forced if needed. -:: -:: Sets ERRORLEVEL to 0 if GENERATOR can be determined, -:: to 1 if it cannot. -:: - -IF DEFINED GENERATOR ( - ECHO [warn ] using existing environment variable GENERATOR - EXIT /B 0 -) - - -IF "%PROFILE:~0,4%" == "MING" ( - SET GENERATOR=MinGW Makefiles - -) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( - SET GENERATOR=Unix Makefiles - -) ELSE IF "%PROFILE:~0,4%" == "MSYS" ( - SET GENERATOR=MSYS Makefiles -) ELSE ( - IF /i "%PLATFORM%" == "x64" SET GENARCH= Win64 - CALL :CHECK 16 - IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 10 2010!GENARCH! - CALL :CHECK 17 - IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 11 2012!GENARCH! - CALL :CHECK 18 - IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 12 2013!GENARCH! - CALL :CHECK 19.0 - IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 14 2015!GENARCH! - CALL :CHECK 19.1 - IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 15 2017!GENARCH! -) - -IF NOT DEFINED GENERATOR ( - ECHO [error] unable to determine the CMake generator to use - EXIT /B 1 -) - -ECHO [info ] using CMake generator %GENERATOR% -EXIT /B 0 - -:CHECK -cl /? 2>&1 | findstr /C:"Version %1%" > nul -EXIT /B diff --git a/build/appveyor/cl_showenv.bat b/build/appveyor/cl_showenv.bat deleted file mode 100644 index a70a4906a..000000000 --- a/build/appveyor/cl_showenv.bat +++ /dev/null @@ -1,63 +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/ -ECHO =============================================================================== -IF "%PROFILE:~0,4%" == "MSVC" ( -ECHO Versions -ECHO ------------------------------------------------------------------------------- -ECHO boost = %BOOST_VERSION% -ECHO libevent = %LIBEVENT_VERSION% -ECHO python = %PYTHON_VERSION% -ECHO qt = %QT_VERSION% -ECHO zlib = %ZLIB_VERSION% -ECHO/ -) -ECHO Appveyor Variables -ECHO ------------------------------------------------------------------------------- -ECHO APPVEYOR_BUILD_FOLDER = %APPVEYOR_BUILD_FOLDER% -ECHO CONFIGURATION = %CONFIGURATION% -ECHO PLATFORM = %PLATFORM% -ECHO PROFILE = %PROFILE% -ECHO/ -ECHO Our Variables -ECHO ------------------------------------------------------------------------------- -ECHO APPVEYOR_SCRIPTS = %APPVEYOR_SCRIPTS% -ECHO BASH = %BASH% -ECHO BOOST_ROOT = %BOOST_ROOT% -ECHO BOOST_INCLUDEDIR = %BOOST_INCLUDEDIR% -ECHO BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% -ECHO BUILDDIR = %BUILDDIR% -ECHO COMPILER = %COMPILER% -ECHO GENERATOR = %GENERATOR% -ECHO INSTDIR = %INSTDIR% -ECHO JAVA_HOME = %JAVA_HOME% -ECHO OPENSSL_ROOT = %OPENSSL_ROOT% -ECHO SETUP = %SETUP% -ECHO SRCDIR = %SRCDIR% -ECHO WIN3P = %WIN3P% -ECHO WITH_PYTHON = %WITH_PYTHON% -ECHO ZLIB_STATIC_SUFFIX = %ZLIB_STATIC_SUFFIX% -IF NOT "%PROFILE:~0,4%" == "MSVC" ( - ECHO/ - ECHO UNIXy PATH - ECHO ------------------------------------------------------------------------------- - %BASH% -lc "echo $PATH" -) -ECHO/ -ECHO Windows PATH -ECHO ------------------------------------------------------------------------------- -ECHO %PATH% -ECHO =============================================================================== -ECHO/ diff --git a/build/appveyor/win_banner_build.bat b/build/appveyor/win_banner_build.bat new file mode 100644 index 000000000..60272f335 --- /dev/null +++ b/build/appveyor/win_banner_build.bat @@ -0,0 +1,23 @@ +:: +:: 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. +:: + +:: A visual indicator in a large log helps you locate things when scanning +:: http://www.patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Build + +ECHO/ +ECHO ___ _ __ __ +ECHO / _ )__ __(_) /__/ / +ECHO / _ / // / / / _ / @@@ BUILD +ECHO /____/\_,_/_/_/\_,_/ +ECHO/ diff --git a/build/appveyor/win_banner_install.bat b/build/appveyor/win_banner_install.bat new file mode 100644 index 000000000..fde3da21a --- /dev/null +++ b/build/appveyor/win_banner_install.bat @@ -0,0 +1,23 @@ +:: +:: 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. +:: + +:: A visual indicator in a large log helps you locate things when scanning +:: http://www.patorjk.com/software/taag/#p=display&f=Small%20Slant&t=Install + +ECHO/ +ECHO ____ __ ____ +ECHO / _/__ ___ / /____ _/ / / +ECHO _/ // _ \(_-^&1 | findstr /C:"Version %1%" > nul +EXIT /B diff --git a/build/appveyor/win_setenv.bat b/build/appveyor/win_setenv.bat new file mode 100644 index 000000000..212ddf57b --- /dev/null +++ b/build/appveyor/win_setenv.bat @@ -0,0 +1,122 @@ +:: +:: 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 + +IF "%PROFILE%" == "MSVC2012" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" %PLATFORM% +) ELSE IF "%PROFILE%" == "MSVC2013" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM% +) ELSE IF "%PROFILE%" == "MSVC2015" ( + CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% +) ELSE IF "%PROFILE%" == "MSVC2017" ( + CALL :SETUPNEWERMSVC || EXIT /B +) ELSE IF "%PROFILE%" == "MINGW" ( + REM Supported, nothing special to do here. +) ELSE IF "%PROFILE%" == "CYGWIN" ( + REM Supported, nothing special to do here. +) ELSE ( + ECHO Unsupported PROFILE=%PROFILE% or PLATFORM=%PLATFORM% + EXIT /B 1 +) + +CALL win_setcompiler.bat || EXIT /B +CALL win_setgenerator.bat || EXIT /B + +SET APPVEYOR_SCRIPTS=%APPVEYOR_BUILD_FOLDER%\build\appveyor +SET BUILDDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% +SET INSTDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% +SET SRCDIR=%APPVEYOR_BUILD_FOLDER% + +:: PLATFORM is x64 or x86 +:: NORM_PLATFORM is 64 or 32 +SET NORM_PLATFORM=%PLATFORM:~-2,2% +IF "%NORM_PLATFORM%" == "86" (SET NORM_PLATFORM=32) + +IF "%PROFILE:~0,4%" == "MSVC" ( + + :: FindBoost needs forward slashes so cmake doesn't see something as an escaped character + SET BOOST_ROOT=C:/Libraries/boost_%BOOST_VERSION:.=_% + SET BOOST_LIBRARYDIR=!BOOST_ROOT!/lib%NORM_PLATFORM%-msvc-%COMPILER:~-3,2%.%COMPILER:~-1,1% + SET OPENSSL_ROOT=C:\OpenSSL-Win%NORM_PLATFORM% + SET WIN3P=%APPVEYOR_BUILD_FOLDER%\thirdparty + + IF "%PYTHON_VERSION%" == "" ( + SET WITH_PYTHON=OFF + ) ELSE ( + SET WITH_PYTHON=ON + IF /i "%PLATFORM%" == "x64" SET PTEXT=-x64 + SET PATH=C:\Python%PYTHON_VERSION:.=%!PTEXT!\scripts;C:\Python%PYTHON_VERSION:.=%!PTEXT!;!PATH! + ) + IF "%CONFIGURATION%" == "Debug" (SET ZLIB_LIB_SUFFIX=d) + + IF NOT "%QT_VERSION%" == "" ( + IF /i "%PLATFORM%" == "x64" SET QTEXT=_64 + SET PATH=C:\Qt\%QT_VERSION%\%PROFILE%!QTEXT!\bin;!PATH! + ) + +) ELSE IF "%PROFILE:~0,4%" == "MING" ( + + :: PLATFORM = x86 means MINGWPLAT i686 + :: PLATFORM = x64 means MINGWPLAT x86_64 + SET MINGWPLAT=x86_64 + IF "%PLATFORM%" == "x86" (SET MINGWPLAT=i686) + + SET BASH=C:\msys64\usr\bin\bash.exe + !BASH! -lc "sed -i '/export PATH=\/mingw32\/bin/d' ~/.bash_profile && sed -i '/export PATH=\/mingw64\/bin/d' ~/.bash_profile && echo 'export PATH=/mingw%NORM_PLATFORM%/bin:$PATH' >> ~/.bash_profile" || EXIT /B + + SET BUILDDIR=%BUILDDIR:\=/% + SET BUILDDIR=/c!BUILDDIR:~2! + SET INSTDIR=%INSTDIR:\=/% + SET INSTDIR=/c!INSTDIR:~2! + SET SRCDIR=%SRCDIR:\=/% + SET SRCDIR=/c!SRCDIR:~2! + +) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( + + SET CYGWINROOT=C:\cygwin + IF "%PLATFORM%" == "x64" (SET CYGWINROOT=!CYGWINROOT!64) + + SET BASH=!CYGWINROOT!\bin\bash.exe + SET SETUP=!CYGWINROOT!\setup-x86 + IF "%PLATFORM%" == "x64" (SET SETUP=!SETUP!_64) + SET SETUP=!SETUP!.exe + + SET BUILDDIR=%BUILDDIR:\=/% + SET BUILDDIR=/cygdrive/c!BUILDDIR:~2! + SET INSTDIR=%INSTDIR:\=/% + SET INSTDIR_CYG=/cygdrive/c!INSTDIR:~2! + SET SRCDIR=%SRCDIR:\=/% + SET SRCDIR=/cygdrive/c!SRCDIR:~2! + +) + +GOTO :EOF + +:SETUPNEWERMSVC + :: If VsDevCmd.bat has already executed, as is the case in the + :: msvc2017 docker container, skip this... + IF NOT DEFINED VSCMD_VER ( + FOR /F "USEBACKQ TOKENS=*" %%i IN (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[15.0,16.0)" -property installationPath`) DO ( + IF "%MSVCROOT%" == "" (SET MSVCROOT=%%i) + ) + SET MSVCPLAT=x86 + IF "%PLATFORM%" == "x64" (SET MSVCPLAT=amd64) + + SET CURRENTDIR=%CD% + CALL "!MSVCROOT!\Common7\Tools\VsDevCmd.bat" -arch=!MSVCPLAT! || EXIT /B + CD %CURRENTDIR% + EXIT /B + ) +:EOF diff --git a/build/appveyor/win_setgenerator.bat b/build/appveyor/win_setgenerator.bat new file mode 100644 index 000000000..5eb6ff31f --- /dev/null +++ b/build/appveyor/win_setgenerator.bat @@ -0,0 +1,79 @@ +:: +:: 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. +:: + +:: +:: Detect the compiler edition we're building in and then +:: set the GENERATOR environment variable to one of: +:: +:: Visual Studio 15 2017 [arch] = Generates Visual Studio 2017 project files. +:: Optional [arch] can be "Win64" or "ARM". +:: Visual Studio 14 2015 [arch] = Generates Visual Studio 2015 project files. +:: Optional [arch] can be "Win64" or "ARM". +:: Visual Studio 12 2013 [arch] = Generates Visual Studio 2013 project files. +:: Optional [arch] can be "Win64" or "ARM". +:: Visual Studio 11 2012 [arch] = Generates Visual Studio 2012 project files. +:: Optional [arch] can be "Win64" or "ARM". +:: Visual Studio 10 2010 [arch] = Generates Visual Studio 2010 project files. +:: Optional [arch] can be "Win64" or "IA64". +:: MinGW Makefiles = Generates makefiles for MinGW +:: MSYS Makefiles = Generates makefiles for MSYS +:: Unix Makefiles = Generates makefiles for CYGWIN +:: +:: Honors any existing GENERATOR environment variable +:: setting instead of overwriting it, to allow it +:: to be forced if needed. +:: +:: Sets ERRORLEVEL to 0 if GENERATOR can be determined, +:: to 1 if it cannot. +:: + +IF DEFINED GENERATOR ( + ECHO [warn ] using existing environment variable GENERATOR + EXIT /B 0 +) + + +IF "%PROFILE:~0,4%" == "MING" ( + SET GENERATOR=MinGW Makefiles + +) ELSE IF "%PROFILE:~0,4%" == "CYGW" ( + SET GENERATOR=Unix Makefiles + +) ELSE IF "%PROFILE:~0,4%" == "MSYS" ( + SET GENERATOR=MSYS Makefiles +) ELSE ( + IF /i "%PLATFORM%" == "x64" SET GENARCH= Win64 + CALL :CHECK 16 + IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 10 2010!GENARCH! + CALL :CHECK 17 + IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 11 2012!GENARCH! + CALL :CHECK 18 + IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 12 2013!GENARCH! + CALL :CHECK 19.0 + IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 14 2015!GENARCH! + CALL :CHECK 19.1 + IF !ERRORLEVEL! == 0 SET GENERATOR=Visual Studio 15 2017!GENARCH! +) + +IF NOT DEFINED GENERATOR ( + ECHO [error] unable to determine the CMake generator to use + EXIT /B 1 +) + +ECHO [info ] using CMake generator %GENERATOR% +EXIT /B 0 + +:CHECK +cl /? 2>&1 | findstr /C:"Version %1%" > nul +EXIT /B diff --git a/build/appveyor/win_showenv.bat b/build/appveyor/win_showenv.bat new file mode 100644 index 000000000..a70a4906a --- /dev/null +++ b/build/appveyor/win_showenv.bat @@ -0,0 +1,63 @@ +:: +:: 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/ +ECHO =============================================================================== +IF "%PROFILE:~0,4%" == "MSVC" ( +ECHO Versions +ECHO ------------------------------------------------------------------------------- +ECHO boost = %BOOST_VERSION% +ECHO libevent = %LIBEVENT_VERSION% +ECHO python = %PYTHON_VERSION% +ECHO qt = %QT_VERSION% +ECHO zlib = %ZLIB_VERSION% +ECHO/ +) +ECHO Appveyor Variables +ECHO ------------------------------------------------------------------------------- +ECHO APPVEYOR_BUILD_FOLDER = %APPVEYOR_BUILD_FOLDER% +ECHO CONFIGURATION = %CONFIGURATION% +ECHO PLATFORM = %PLATFORM% +ECHO PROFILE = %PROFILE% +ECHO/ +ECHO Our Variables +ECHO ------------------------------------------------------------------------------- +ECHO APPVEYOR_SCRIPTS = %APPVEYOR_SCRIPTS% +ECHO BASH = %BASH% +ECHO BOOST_ROOT = %BOOST_ROOT% +ECHO BOOST_INCLUDEDIR = %BOOST_INCLUDEDIR% +ECHO BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% +ECHO BUILDDIR = %BUILDDIR% +ECHO COMPILER = %COMPILER% +ECHO GENERATOR = %GENERATOR% +ECHO INSTDIR = %INSTDIR% +ECHO JAVA_HOME = %JAVA_HOME% +ECHO OPENSSL_ROOT = %OPENSSL_ROOT% +ECHO SETUP = %SETUP% +ECHO SRCDIR = %SRCDIR% +ECHO WIN3P = %WIN3P% +ECHO WITH_PYTHON = %WITH_PYTHON% +ECHO ZLIB_STATIC_SUFFIX = %ZLIB_STATIC_SUFFIX% +IF NOT "%PROFILE:~0,4%" == "MSVC" ( + ECHO/ + ECHO UNIXy PATH + ECHO ------------------------------------------------------------------------------- + %BASH% -lc "echo $PATH" +) +ECHO/ +ECHO Windows PATH +ECHO ------------------------------------------------------------------------------- +ECHO %PATH% +ECHO =============================================================================== +ECHO/ -- cgit v1.2.1