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 2391f33 THRIFT-4545: fix haskell build on windows, fix appveyor stale
packages
2391f33 is described below
commit 2391f33465b7b5ec1f3c9191f627a469916b892a
Author: James E. King III <[email protected]>
AuthorDate: Sun Nov 11 10:18:41 2018 -0500
THRIFT-4545: fix haskell build on windows, fix appveyor stale packages
---
build/appveyor/MSVC-appveyor-build.bat | 3 ---
build/appveyor/MSVC-appveyor-install.bat | 15 +++++++--------
build/appveyor/cl_setenv.bat | 1 -
build/appveyor/cl_showenv.bat | 1 -
lib/hs/thrift.cabal | 8 ++++----
5 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/build/appveyor/MSVC-appveyor-build.bat
b/build/appveyor/MSVC-appveyor-build.bat
index 31aac57..a4b92a2 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 f9eb0c6..f973d29 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 10af2d3..62856cb 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 3dda546..a70a490 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%
diff --git a/lib/hs/thrift.cabal b/lib/hs/thrift.cabal
index 03a9814..a907d78 100644
--- a/lib/hs/thrift.cabal
+++ b/lib/hs/thrift.cabal
@@ -18,8 +18,8 @@
--
Name: thrift
-Version: 1.0.0-dev
-Cabal-Version: >= 1.24
+Version: 0.99.0
+Cabal-Version: 1.24
License: OtherLicense
Category: Foreign
Build-Type: Simple
@@ -63,8 +63,7 @@ Library
Thrift.Transport.IOBuffer,
Thrift.Transport.Memory,
Thrift.Types
- Default-Language:
- Haskell2010
+ Default-Language: Haskell2010
Default-Extensions:
DeriveDataTypeable,
ExistentialQuantification,
@@ -82,3 +81,4 @@ Test-Suite spec
Ghc-Options: -Wall
main-is: Spec.hs
Build-Depends: base, thrift, hspec, QuickCheck >= 2.8.2, bytestring >= 0.10,
unordered-containers >= 0.2.6
+ Default-Language: Haskell2010
