diff options
| author | James E. King III <jking@apache.org> | 2018-11-11 10:18:41 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-11-11 17:07:24 -0500 |
| commit | 2391f33465b7b5ec1f3c9191f627a469916b892a (patch) | |
| tree | 7cdfcfb2329f07d62148702ad9af4c3fc3ee3b62 /build/appveyor | |
| parent | d5bd2005eac7fa4912b60b3a815596c67a348afb (diff) | |
| download | thrift-2391f33465b7b5ec1f3c9191f627a469916b892a.tar.gz | |
THRIFT-4545: fix haskell build on windows, fix appveyor stale packages
Diffstat (limited to 'build/appveyor')
| -rw-r--r-- | build/appveyor/MSVC-appveyor-build.bat | 3 | ||||
| -rw-r--r-- | build/appveyor/MSVC-appveyor-install.bat | 15 | ||||
| -rw-r--r-- | build/appveyor/cl_setenv.bat | 1 | ||||
| -rw-r--r-- | build/appveyor/cl_showenv.bat | 1 |
4 files changed, 7 insertions, 13 deletions
diff --git a/build/appveyor/MSVC-appveyor-build.bat b/build/appveyor/MSVC-appveyor-build.bat index 31aac57c9..a4b92a29c 100644 --- a/build/appveyor/MSVC-appveyor-build.bat +++ b/build/appveyor/MSVC-appveyor-build.bat @@ -21,8 +21,6 @@ CALL cl_setenv.bat || EXIT /B MKDIR "%BUILDDIR%" || EXIT /B CD "%BUILDDIR%" || EXIT /B -:: Haskell is disabled for cmake (Windows), see Jira THRIFT-4545 - @ECHO ON cmake "%SRCDIR%" ^ -G"%GENERATOR%" ^ @@ -38,7 +36,6 @@ CD "%BUILDDIR%" || EXIT /B -DOPENSSL_USE_STATIC_LIBS=OFF ^ -DZLIB_LIBRARY="%WIN3P%\zlib-inst\lib\zlib%ZLIB_LIB_SUFFIX%.lib" ^ -DZLIB_ROOT="%WIN3P%\zlib-inst" ^ - -DWITH_HASKELL=OFF ^ -DWITH_PYTHON=%WITH_PYTHON% ^ -DWITH_%THREADMODEL%THREADS=ON ^ -DWITH_SHARED_LIB=OFF ^ diff --git a/build/appveyor/MSVC-appveyor-install.bat b/build/appveyor/MSVC-appveyor-install.bat index f9eb0c67d..f973d29cf 100644 --- a/build/appveyor/MSVC-appveyor-install.bat +++ b/build/appveyor/MSVC-appveyor-install.bat @@ -31,14 +31,14 @@ choco feature enable -n allowGlobalConfirmation || EXIT /B :: Things to install when NOT running in appveyor: IF "%APPVEYOR_BUILD_ID%" == "" ( cup -y chocolatey || EXIT /B - cinst -c "%BUILDCACHE%" -y curl || EXIT /B - cinst -c "%BUILDCACHE%" -y 7zip || EXIT /B - cinst -c "%BUILDCACHE%" -y python3 || EXIT /B - cinst -c "%BUILDCACHE%" -y openssl.light || EXIT /B + cinst -y curl || EXIT /B + cinst -y 7zip || EXIT /B + cinst -y python3 || EXIT /B + cinst -y openssl.light || EXIT /B ) -cinst -c "%BUILDCACHE%" -y jdk8 || EXIT /B -cinst -c "%BUILDCACHE%" -y winflexbison3 || EXIT /B +cinst -y jdk8 || EXIT /B +cinst -y winflexbison3 || EXIT /B :: zlib - not available through chocolatey CD "%APPVEYOR_SCRIPTS%" || EXIT /B @@ -56,5 +56,4 @@ pip.exe ^ tornado ^ twisted || EXIT /B -:: Haskell (GHC) and cabal (disabled: see Jira THRIFT-4545) -:: cinst -c "%BUILDCACHE%" -y ghc || EXIT /B +cinst -y ghc || EXIT /B diff --git a/build/appveyor/cl_setenv.bat b/build/appveyor/cl_setenv.bat index 10af2d347..62856cba0 100644 --- a/build/appveyor/cl_setenv.bat +++ b/build/appveyor/cl_setenv.bat @@ -37,7 +37,6 @@ CALL cl_setcompiler.bat || EXIT /B CALL cl_setgenerator.bat || EXIT /B SET APPVEYOR_SCRIPTS=%APPVEYOR_BUILD_FOLDER%\build\appveyor -SET BUILDCACHE=%APPVEYOR_BUILD_FOLDER%\..\build\cache SET BUILDDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% SET INSTDIR=%APPVEYOR_BUILD_FOLDER%\..\build\%PROFILE%\%PLATFORM% SET SRCDIR=%APPVEYOR_BUILD_FOLDER% diff --git a/build/appveyor/cl_showenv.bat b/build/appveyor/cl_showenv.bat index 3dda546e5..a70a4906a 100644 --- a/build/appveyor/cl_showenv.bat +++ b/build/appveyor/cl_showenv.bat @@ -38,7 +38,6 @@ ECHO BASH = %BASH% ECHO BOOST_ROOT = %BOOST_ROOT% ECHO BOOST_INCLUDEDIR = %BOOST_INCLUDEDIR% ECHO BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% -ECHO BUILDCACHE = %BUILDCACHE% ECHO BUILDDIR = %BUILDDIR% ECHO COMPILER = %COMPILER% ECHO GENERATOR = %GENERATOR% |