update jenkins.sh to conform with current build environment

Change-Id: I999d35cdffbdb61984da15d616f675005aa0688c

1 files changed, 31 insertions, 13 deletions

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 71ba909..f319acb 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,21 +1,39 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# jenkins build helper script for openbsc.  This is how we build on jenkins.osmocom.org
+
+if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
+	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
+	exit 2
+fi
+
 
 set -ex
 
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst
 
-mkdir deps || true
-cd deps
-osmo-deps.sh libosmocore
+mkdir "$deps" || true
+rm -rf "$inst"
 
-cd libosmocore
-autoreconf --install --force
-./configure --prefix=$PWD/../install
-$MAKE $PARALLEL_MAKE install
+osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
 
-cd ../../
+set +x
+echo
+echo
+echo
+echo " =============================== openggsn ==============================="
+echo
+set -x
 
+cd "$base"
 autoreconf --install --force
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck
+./configure
+$MAKE $PARALLEL_MAKE
+$MAKE distcheck