Change in osmo-trx[master]: contrib/jenkins.sh: build and publish manuals

[osmith]

osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12075 )

Change subject: contrib/jenkins.sh: build and publish manuals
......................................................................

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: I54fdd18e405b2c84762ea06d91359867ceec8184
---
M contrib/jenkins.sh
1 file changed, 21 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 029f0e1..4523a5a 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,4 +1,12 @@
 #!/bin/sh
+# jenkins build helper script for osmo-trx.  This is how we build on jenkins.osmocom.org
+#
+# environment variables:
+# * INSTR: configure the CPU instruction set ("--with-sse", "--with-neon" or "--with-neon-vfpv4")
+# * WITH_MANUALS: build manual PDFs if set to "1"
+# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")
+# * INSIDE_CHROOT: (used internally) set to "1" when the script runs with QEMU in an ARM chroot
+#
 set -ex
 
 substr() { [ -z "${2##*$1*}" ]; }
@@ -68,6 +76,14 @@
 
 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
@@ -79,9 +95,13 @@
 
 cd "$base"
 autoreconf --install --force
-./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR
+./configure --enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms $INSTR $CONFIG
 $MAKE $PARALLEL_MAKE
 $MAKE check \
   || cat-testlogs.sh
 
+if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
+	make -C "$base/doc/manuals" publish
+fi
+
 osmo-clean-workspace.sh

-- 
To view, visit https://gerrit.osmocom.org/12075
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I54fdd18e405b2c84762ea06d91359867ceec8184
Gerrit-Change-Number: 12075
Gerrit-PatchSet: 4
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181205/85af39b2/attachment.htm>