From fdcb9611370126e2114afa2737be823896d9ed0d Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 6 Oct 2016 23:23:24 +0200 Subject: jenkins.sh: use osmo-build-dep.sh, print separator Change-Id: I36ce41c669ffb123ec0741061e357a94baee6460 --- contrib/jenkins.sh | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'contrib') diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e315b4f..50628fc 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,20 +2,28 @@ set -ex -rm -rf deps/install -mkdir deps || true -cd deps -osmo-deps.sh libosmocore +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst -cd libosmocore -autoreconf --install --force -./configure --prefix=$PWD/../install -$MAKE $PARALLEL_MAKE install +mkdir "$deps" || true +rm -rf "$inst" + +osmo-build-dep.sh libosmocore + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +set +x +echo +echo +echo +echo " =============================== libosmo-abis ===============================" +echo +set -x -cd ../../ autoreconf --install --force -export PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH -export LD_LIBRARY_PATH=$PWD/deps/install/lib ./configure $MAKE $PARALLEL_MAKE $MAKE distcheck -- cgit v1.2.3