From 397903fdb724b22b1c5be1fddb940baa434baa93 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 30 Nov 2018 15:56:41 +0100 Subject: contrib/jenkins.sh: build and publish manuals Add new environment variables WITH_MANUALS and PUBLISH to control if the manuals should be built and uploaded. Describe all environment vars on top of the file. When WITH_MANUALS is set, install osmo-gsm-manuals like any other dependency and add --enable-manuals to the configure flags (for "make" and "make distcheck"). Add the bin subdir of the installed files to PATH, so osmo-gsm-manuals-check-depends can be used by ./configure. Related: OS#3385 Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051 --- contrib/jenkins.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a417a9e..c54c1ac 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,10 @@ #!/bin/sh # jenkins build helper script for libosmo-sccp. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# 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 !" @@ -22,11 +27,19 @@ 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" +export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + osmo-build-dep.sh osmo-gsm-manuals + CONFIG="--enable-manuals" +fi + set +x echo echo @@ -36,10 +49,14 @@ echo set -x autoreconf --install --force -./configure --enable-sanitize --enable-werror --enable-external-tests +./configure --enable-sanitize --enable-werror --enable-external-tests $CONFIG $MAKE $PARALLEL_MAKE -DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests" \ +DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests $CONFIG" \ $MAKE distcheck \ || cat-testlogs.sh +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + osmo-clean-workspace.sh -- cgit v1.2.3