This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new f3ec277 Fix cygwin builds on appveyor
f3ec277 is described below
commit f3ec277e7e2c147342831ecec590bc2f71b07761
Author: James E. King III <[email protected]>
AuthorDate: Sat Jan 12 11:52:04 2019 -0500
Fix cygwin builds on appveyor
---
appveyor.yml | 11 ++---------
build/appveyor/CYGW-appveyor-build.bat | 6 ++++--
build/appveyor/CYGW-appveyor-install.bat | 12 +++++++++++-
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 4c0144c..977ade6 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,8 +32,6 @@ os:
- Visual Studio 2017
matrix:
- allow_failures:
- - PROFILE: CYGWIN
fast_finish: true
environment:
@@ -51,7 +49,7 @@ environment:
- PROFILE: MSVC2015
PLATFORM: x86
- CONFIGURATION: Release
+ CONFIGURATION: Debug
BUILD_SHARED_LIBS: OFF
BOOST_VERSION: 1.62.0
LIBEVENT_VERSION: 2.0.22
@@ -67,15 +65,10 @@ environment:
DISABLED_TESTS: StressTestNonBlocking
- PROFILE: CYGWIN
- PLATFORM: x86
+ PLATFORM: x64
CONFIGURATION: RelWithDebInfo
DISABLED_TESTS:
(ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
-# - PROFILE: CYGWIN
-# PLATFORM: x64
-# CONFIGURATION: RelWithDebInfo
-# DISABLED_TESTS:
(ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
-
install:
- cd %APPVEYOR_BUILD_FOLDER%
- call build\appveyor\%PROFILE:~0,4%-appveyor-install.bat
diff --git a/build/appveyor/CYGW-appveyor-build.bat
b/build/appveyor/CYGW-appveyor-build.bat
index fbcc84b..7f33287 100644
--- a/build/appveyor/CYGW-appveyor-build.bat
+++ b/build/appveyor/CYGW-appveyor-build.bat
@@ -23,11 +23,13 @@ SET CMAKEARGS=^
-G'%GENERATOR%' ^
-DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
-DCMAKE_INSTALL_PREFIX=%INSTDIR% ^
- -DCMAKE_CXX_EXTENSIONS=ON ^
-DCMAKE_CXX_FLAGS="-D_GNU_SOURCE" ^
- -DCMAKE_CXX_STANDARD=11 ^
+ -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
index 77db7d4..79b6ef0 100644
--- a/build/appveyor/CYGW-appveyor-install.bat
+++ b/build/appveyor/CYGW-appveyor-install.bat
@@ -31,4 +31,14 @@ CALL cl_showenv.bat || EXIT /B
%BASH% -lc "wget 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 bison cmake flex gcc-g++ libboost-devel
libevent-devel make openssl-devel zlib-devel"
+%BASH% -lc "apt-cyg install bison cmake flex gcc-g++ libboost-devel
libevent-devel make openssl-devel xz zlib-devel"
+
+::
+:: We need a newer version of cmake, the one cygwin provides is too old
+:: to recognize the version of boost. Luckily there is a pre-release
+:: one available, however cygwin's own setup program has no command line
+:: option to allow access to test packages!
+::
+
+%BASH% -lc "apt-cyg remove cmake"
+%BASH% -lc "cd / && wget
http://mirror.clarkson.edu/cygwin/x86_64/release/cmake/cmake-3.13.1-1.tar.xz &&
tar xJf cmake-3.13.1-1.tar.xz && hash -r && cmake --version"
