[PATCH] osmo-msc[master]: Make use of osmo-build.sh, which introduces dependency artif...

[André Boddenberg]

Review at  https://gerrit.osmocom.org/3831

Make use of osmo-build.sh, which introduces dependency artifacts.

Change-Id: I6228536f6c6f79e5534361ea3653669d9bdd81e9
---
M contrib/jenkins.sh
1 file changed, 41 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/3831/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index a7313c5..cb59676 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,57 +1,50 @@
 #!/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
+artifact_deps() {
+	x="$($1 libosmocore)"
+	x="${x}_$($1 libosmo-abis)"
+	x="${x}_$($1 libosmo-netif)"
+	x="${x}_$($1 libosmo-sccp)"
+	x="${x}_$($1 libsmpp34)"
+	x="${x}_$($1 openggsn)"
+	x="${x}_$($1 osmo-mgw)"
 
+	if [ "x$IU" = "x--enable-iu" ]; then
+		x="${x}_$($1 libasn1c)"
+		#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
+		x="${x}_$($1 osmo-iuh)"
+	fi
+}
 
-set -ex
+build_deps() {
+	osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
+	verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+	osmo-build-dep.sh libosmo-abis
+	osmo-build-dep.sh libosmo-netif
+	osmo-build-dep.sh libosmo-sccp
+	PARALLEL_MAKE="" osmo-build-dep.sh libsmpp34
+	osmo-build-dep.sh openggsn
+	osmo-build-dep.sh osmo-mgw
 
-base="$PWD"
-deps="$base/deps"
-inst="$deps/install"
-export deps inst
+	if [ "x$IU" = "x--enable-iu" ]; then
+		osmo-build-dep.sh libasn1c
+		#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
+		osmo-build-dep.sh osmo-iuh
+	fi
+}
 
-mkdir "$deps" || true
-rm -rf "$inst"
-
-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"
-
-osmo-build-dep.sh libosmo-abis
-osmo-build-dep.sh libosmo-netif
-osmo-build-dep.sh libosmo-sccp
-PARALLEL_MAKE="" osmo-build-dep.sh libsmpp34
-osmo-build-dep.sh openggsn
-osmo-build-dep.sh osmo-mgw
-
-if [ "x$IU" = "x--enable-iu" ]; then
-	osmo-build-dep.sh libasn1c
-	#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
-	osmo-build-dep.sh osmo-iuh
-fi
-
-set +x
-echo
-echo
-echo
-echo " =============================== osmo-msc ==============================="
-echo
-set -x
-
-cd "$base"
-autoreconf --install --force
-./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
-$MAKE $PARALLEL_MAKE
-LD_LIBRARY_PATH="$inst/lib" $MAKE check \
-  || cat-testlogs.sh
-LD_LIBRARY_PATH="$inst/lib" \
+build_project() {
+	cd $base
+	autoreconf --install --force
+	./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
+	$MAKE $PARALLEL_MAKE
+	LD_LIBRARY_PATH="$inst/lib" $MAKE check \
+		|| cat-testlogs.sh
+	LD_LIBRARY_PATH="$inst/lib" \
   DISTCHECK_CONFIGURE_FLAGS="--enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests" \
   $MAKE distcheck \
-  || cat-testlogs.sh
+		|| cat-testlogs.sh
+}
+
+. osmo-build.sh

-- 
To view, visit https://gerrit.osmocom.org/3831
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6228536f6c6f79e5534361ea3653669d9bdd81e9
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: André Boddenberg <dr.blobb at gmail.com>