From 6bae2d11f1c6801c2f2ef9d6b1bd7b471767fc3c Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 10 Aug 2016 14:42:16 +0200 Subject: [PATCH] jenkins.sh: use absolute paths instead of 'cd ..' and $PWD Change-Id: If79d283fa0a559bb7ea319c513d09466eff523d1 --- contrib/jenkins.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7d3acc07..b4b0cb76 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -12,18 +12,22 @@ if [ $sysmobts = "no" -a $sysmodsp = "yes" ]; then exit 0 fi -rm -rf deps/install -mkdir deps || true -cd deps +base="$PWD" +deps="$base/deps" +inst="$deps/install" + +rm -rf "$inst" +mkdir "$deps" || true +cd "$deps" osmo-deps.sh libosmocore cd libosmocore autoreconf --install --force -./configure --prefix=$PWD/../install +./configure --prefix="$inst" $MAKE $PARALLEL_MAKE install # Install the API -cd ../ +cd "$deps" if ! test -d layer1-api; then git clone git://git.sysmocom.de/sysmo-bts/layer1-api.git layer1-api @@ -32,16 +36,17 @@ fi cd layer1-api git fetch origin git reset --hard origin/master -mkdir -p $PWD/../install/include/sysmocom/femtobts/ -cp include/*.h ../install/include/sysmocom/femtobts/ +api_incl="$inst/include/sysmocom/femtobts/" +mkdir -p "$api_incl" +cp include/*.h "$api_incl" -cd ../../ +cd "$base" autoreconf --install --force BTS_CONFIG="--enable-sysmocom-bts=$sysmobts --enable-sysmocom-dsp=$sysmodsp" if [ $sysmobts = "no" ]; then BTS_CONFIG="$BTS_CONFIG --enable-vty-tests" fi -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure $BTS_CONFIG -PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="$BTS_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$BTS_CONFIG" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck +PKG_CONFIG_PATH="$inst/lib/pkgconfig" ./configure $BTS_CONFIG +PKG_CONFIG_PATH="$inst/lib/pkgconfig" $MAKE $PARALLEL_MAKE +DISTCHECK_CONFIGURE_FLAGS="$BTS_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$BTS_CONFIG" PKG_CONFIG_PATH="$inst/lib/pkgconfig" LD_LIBRARY_PATH="$inst/lib" $MAKE distcheck