diff options
author | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-05 12:42:21 +0200 |
---|---|---|
committer | Mario Emmenlauer <memmenlauer@biodataanalysis.de> | 2021-08-11 19:25:54 +0200 |
commit | 9e3ac856eef29d0317b8aaec8c3ae810a14a2108 (patch) | |
tree | d19747f7810008e9868ef7472dde1c40e2360854 /build | |
parent | e14ac85d9e49356a58c6154b7c7bf10231e60ba0 (diff) | |
download | thrift-9e3ac856eef29d0317b8aaec8c3ae810a14a2108.tar.gz |
Renamed Windows build files from cl-prefix to win-prefix
Diffstat (limited to 'build')
20 files changed, 31 insertions, 56 deletions
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/win_banner_build.bat index 60272f335..60272f335 100644 --- a/build/appveyor/cl_banner_build.bat +++ b/build/appveyor/win_banner_build.bat diff --git a/build/appveyor/cl_banner_install.bat b/build/appveyor/win_banner_install.bat index fde3da21a..fde3da21a 100644 --- a/build/appveyor/cl_banner_install.bat +++ b/build/appveyor/win_banner_install.bat diff --git a/build/appveyor/cl_banner_test.bat b/build/appveyor/win_banner_test.bat index 44e2d1077..44e2d1077 100644 --- a/build/appveyor/cl_banner_test.bat +++ b/build/appveyor/win_banner_test.bat diff --git a/build/appveyor/cl_setcompiler.bat b/build/appveyor/win_setcompiler.bat index 733ffc538..733ffc538 100644 --- a/build/appveyor/cl_setcompiler.bat +++ b/build/appveyor/win_setcompiler.bat diff --git a/build/appveyor/cl_setenv.bat b/build/appveyor/win_setenv.bat index 40cfc73db..212ddf57b 100644 --- a/build/appveyor/cl_setenv.bat +++ b/build/appveyor/win_setenv.bat @@ -31,8 +31,8 @@ IF "%PROFILE%" == "MSVC2012" ( EXIT /B 1 ) -CALL cl_setcompiler.bat || EXIT /B -CALL cl_setgenerator.bat || EXIT /B +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% diff --git a/build/appveyor/cl_setgenerator.bat b/build/appveyor/win_setgenerator.bat index 5eb6ff31f..5eb6ff31f 100644 --- a/build/appveyor/cl_setgenerator.bat +++ b/build/appveyor/win_setgenerator.bat diff --git a/build/appveyor/cl_showenv.bat b/build/appveyor/win_showenv.bat index a70a4906a..a70a4906a 100644 --- a/build/appveyor/cl_showenv.bat +++ b/build/appveyor/win_showenv.bat |