diff options
-rwxr-xr-x | contrib/jenkins.sh | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index b4b0cb76..e108e369 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -7,9 +7,9 @@ if [ -z "$MAKE" ]; then exit 1 fi -if [ $sysmobts = "no" -a $sysmodsp = "yes" ]; then - echo "This config does not make sense." - exit 0 +if [ "$sysmobts" = "no" -a "$sysmodsp" = "yes" ]; then + echo "This config does not make sense." + exit 0 fi base="$PWD" @@ -17,22 +17,19 @@ deps="$base/deps" inst="$deps/install" rm -rf "$inst" -mkdir "$deps" || true +mkdir -p "$deps" + cd "$deps" osmo-deps.sh libosmocore - cd libosmocore autoreconf --install --force ./configure --prefix="$inst" $MAKE $PARALLEL_MAKE install -# Install the API cd "$deps" -if ! test -d layer1-api; -then +if [ ! -d layer1-api ]; then git clone git://git.sysmocom.de/sysmo-bts/layer1-api.git layer1-api fi - cd layer1-api git fetch origin git reset --hard origin/master @@ -40,13 +37,15 @@ api_incl="$inst/include/sysmocom/femtobts/" mkdir -p "$api_incl" cp include/*.h "$api_incl" -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" +PCU_CONFIG="--enable-sysmocom-bts=$sysmobts --enable-sysmocom-dsp=$sysmodsp" +if [ "$sysmobts" = "no" ]; then + PCU_CONFIG="$PCU_CONFIG --enable-vty-tests" fi -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 +export PKG_CONFIG_PATH="$inst/lib/pkgconfig" +export LD_LIBRARY_PATH="$inst/lib" +cd "$base" +autoreconf --install --force +./configure $PCU_CONFIG +$MAKE $PARALLEL_MAKE +DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" AM_DISTCHECK_CONFIGURE_FLAGS="$PCU_CONFIG" $MAKE distcheck |