From 33c537e5a756d3390f454968dda5ab14b98e2314 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 29 Nov 2018 14:16:27 +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: I43e3b592c593237eb4df2d70c926c031ddb7b20b --- contrib/jenkins.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19df974..b512334 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * GTP: configure GTP tunneling Linux kernel (values: "--enable-gtp-linux" or "--disable-gtp-linux") +# * 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 !" @@ -27,6 +33,14 @@ 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" + +# 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 @@ -38,8 +52,12 @@ set -x cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-werror $GTP +./configure --enable-sanitize --enable-werror $GTP $CONFIG $MAKE $PARALLEL_MAKE -$MAKE distcheck +DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck + +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi osmo-clean-workspace.sh -- cgit v1.2.3