qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [1/2] qpid-dispatch git commit: NO-JIRA: Remove libuv, libwebsockets from travis build
Date Mon, 29 May 2017 19:20:16 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master 6e0949450 -> b1f09d5ea


NO-JIRA: Remove libuv, libwebsockets from travis build

- epoll proactor is now the default, no need for libuv
- libwebsockets on travis is too old, tested on other platforms
- enabled ccache to speed up compilation


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/d773cc8e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/d773cc8e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/d773cc8e

Branch: refs/heads/master
Commit: d773cc8e5e5efba135bd9dea1dcdb682b4ff11e8
Parents: 6e09494
Author: Alan Conway <aconway@redhat.com>
Authored: Thu May 25 18:47:41 2017 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Thu May 25 18:47:41 2017 -0400

----------------------------------------------------------------------
 .travis.yml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d773cc8e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 32b7b5a..b7514f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,13 +21,11 @@ os: linux
 dist: trusty
 sudo: true
 language: c
+cache: ccache
 
 addons:
   apt:
     packages:
-    # Libuv requirements
-    - automake
-    - libtool
     # Proton requirements
     - cmake
     - libsasl2-dev
@@ -38,28 +36,15 @@ addons:
     - swig
     # For apache RAT tool
     - maven
+    # documentation
+    - asciidoc
+    - dblatex
 
 install:
 - PREFIX=$PWD/install
-- git submodule add -b v1.x https://github.com/libuv/libuv
-- git submodule add -b v2.1-stable https://github.com/warmcat/libwebsockets
 - git submodule add https://git-wip-us.apache.org/repos/asf/qpid-proton.git
 - git submodule update --init
 
-# Build and install libuv 1.0 from source, trusty only has 0.10
-- pushd libuv
-- sh autogen.sh
-- ./configure --prefix $PREFIX
-- make && make install
-- popd
-
-# Build and install libwebsockets 2.1 from source, trusty only has 1.2
-- mkdir libwebsockets/build
-- pushd libwebsockets/build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX
-- make install
-- popd
-
 # Build and install latest proton from source.
 - mkdir qpid-proton/build
 - pushd qpid-proton/build


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message