You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by he...@apache.org on 2014/07/26 13:11:55 UTC
git commit: THRIFT-2638 travis: build with Haskell Patch: John Chee
Repository: thrift
Updated Branches:
refs/heads/master 2591be279 -> c0a7d72c8
THRIFT-2638 travis: build with Haskell
Patch: John Chee
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c0a7d72c
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c0a7d72c
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c0a7d72c
Branch: refs/heads/master
Commit: c0a7d72c83d93cf266d57b25a3b8850eb81c47d6
Parents: 2591be2
Author: henrique <he...@apache.org>
Authored: Sat Jul 26 13:11:12 2014 +0200
Committer: henrique <he...@apache.org>
Committed: Sat Jul 26 13:11:12 2014 +0200
----------------------------------------------------------------------
.travis.yml | 9 +++++++--
contrib/installDependencies.sh | 7 ++++---
lib/hs/Makefile.am | 3 +--
tutorial/hs/Makefile.am | 5 ++---
4 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/c0a7d72c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 017ac74..93f0a03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,11 +33,14 @@ env:
# Small Set
- CONFIG="--without-erlang --without-haskell --without-python --without-go --without-lua --without-d --without-ruby --without-nodejs --without-java"
+ # C & C++ & Haskell (for some reason qt4 is required)
+ - CONFIG="--without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php-extension --without-ruby --without-go --without-d" GHCVER=7.8.3
+
# Build All
# TODO: fix these languages
- - CONFIG="--without-erlang --without-haskell --without-python --without-go --without-lua"
+ - CONFIG="--without-erlang --without-python --without-go --without-lua" GHCVER=7.8.3
+
-
matrix:
include:
- compiler: gcc
@@ -61,6 +64,8 @@ matrix:
## Default build sequence:
before_install:
- sh contrib/installDependencies.sh 1> /dev/null;
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.20/bin:$PATH
+ - cabal update
install:
- sh bootstrap.sh;
http://git-wip-us.apache.org/repos/asf/thrift/blob/c0a7d72c/contrib/installDependencies.sh
----------------------------------------------------------------------
diff --git a/contrib/installDependencies.sh b/contrib/installDependencies.sh
index ef76d2f..343ea7e 100755
--- a/contrib/installDependencies.sh
+++ b/contrib/installDependencies.sh
@@ -52,9 +52,10 @@ sudo apt-get install -qq erlang-base erlang-eunit erlang-dev
echo "golang-go golang-go/dashboard boolean false" | debconf-set-selections
sudo apt-get -y install -qq golang golang-go
-# Haskell dependencies TODO
-#sudo apt-get install -qq ghc cabal-install libghc-binary-dev libghc-network-dev libghc-http-dev libghc-hashable-dev libghc-unordered-containers-dev libghc-vector-dev
-#sudo cabal update
+# Haskell dependencies
+sudo add-apt-repository -y ppa:hvr/ghc
+sudo apt-get update
+sudo apt-get install cabal-install-1.20 ghc-$GHCVER
# Lua dependencies
sudo apt-get install -qq lua5.2 lua5.2-dev
http://git-wip-us.apache.org/repos/asf/thrift/blob/c0a7d72c/lib/hs/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am
index 70c51c7..3c891f4 100644
--- a/lib/hs/Makefile.am
+++ b/lib/hs/Makefile.am
@@ -26,8 +26,7 @@ EXTRA_DIST = \
src
all-local:
- $(CABAL) configure $(CABAL_CONFIGURE_FLAGS)
- $(CABAL) build
+ $(CABAL) install
install-exec-hook:
$(CABAL) install
http://git-wip-us.apache.org/repos/asf/thrift/blob/c0a7d72c/tutorial/hs/Makefile.am
----------------------------------------------------------------------
diff --git a/tutorial/hs/Makefile.am b/tutorial/hs/Makefile.am
index 2b02732..f274eb6 100755
--- a/tutorial/hs/Makefile.am
+++ b/tutorial/hs/Makefile.am
@@ -18,9 +18,8 @@
#
all-local:
- $(CABAL) configure $(CABAL_CONFIGURE_FLAGS)
$(top_builddir)/compiler/cpp/thrift --gen hs -r $(top_srcdir)/tutorial/tutorial.thrift
- $(CABAL) build
+ $(CABAL) install
install-exec-hook:
$(CABAL) install
@@ -37,4 +36,4 @@ tutorialserver: all
dist/build/HaskellServer/HaskellServer
tutorialclient: all
- dist/build/HaskellClient/HaskellClient
\ No newline at end of file
+ dist/build/HaskellClient/HaskellClient