Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E6BAD200BCA for ; Mon, 21 Nov 2016 20:49:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E5666160AF9; Mon, 21 Nov 2016 19:49:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3B083160AEF for ; Mon, 21 Nov 2016 20:49:53 +0100 (CET) Received: (qmail 85949 invoked by uid 500); 21 Nov 2016 19:49:52 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 85940 invoked by uid 99); 21 Nov 2016 19:49:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2016 19:49:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B689E0999; Mon, 21 Nov 2016 19:49:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: celix git commit: CELIX-387: Fixes travis cfg Date: Mon, 21 Nov 2016 19:49:52 +0000 (UTC) archived-at: Mon, 21 Nov 2016 19:49:54 -0000 Repository: celix Updated Branches: refs/heads/develop 2f81c78c2 -> f0d485337 CELIX-387: Fixes travis cfg Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/f0d48533 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/f0d48533 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/f0d48533 Branch: refs/heads/develop Commit: f0d48533724b2852f3ac214962d58df9fc08c35c Parents: 2f81c78 Author: Pepijn Noltes Authored: Mon Nov 21 20:54:13 2016 +0100 Committer: Pepijn Noltes Committed: Mon Nov 21 20:54:13 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/f0d48533/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index b543400..66564e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ before_install: before_script: - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz -O /tmp/cpputest.tar.gz - tar -xzvf /tmp/cpputest.tar.gz -C /tmp - - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr/local && make && sudo make install && cd - - - cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr/local && make && sudo make install && cd - + - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd - + - cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd - - git clone https://github.com/akheron/jansson.git jansson-build - cd jansson-build && git checkout 2.7 - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local . && make