<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11972">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins.sh: build and publish manuals<br><br>Add new environment variables WITH_MANUALS and PUBLISH to control if<br>the manuals should be built and uploaded. Describe all environment vars<br>on top of the file.<br><br>When WITH_MANUALS is set, install osmo-gsm-manuals like any other<br>dependency and add --enable-manuals to the configure flags (for "make"<br>and "make distcheck"). Add the bin subdir of the installed files to<br>PATH, so osmo-gsm-manuals-check-depends can be used by ./configure.<br><br>Related: OS#3385<br>Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3<br>---<br>M contrib/jenkins.sh<br>1 file changed, 19 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 0be4fe0..a47935f 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -1,5 +1,10 @@</span><br><span> #!/usr/bin/env bash</span><br><span> # jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# environment variables:</span><br><span style="color: hsl(120, 100%, 40%);">+# * WITH_MANUALS: build manual PDFs if set to "1"</span><br><span style="color: hsl(120, 100%, 40%);">+# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span> </span><br><span> if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then</span><br><span> echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"</span><br><span>@@ -24,12 +29,20 @@</span><br><span> </span><br><span> export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"</span><br><span> export LD_LIBRARY_PATH="$inst/lib"</span><br><span style="color: hsl(120, 100%, 40%);">+export PATH="$inst/bin:$PATH"</span><br><span> </span><br><span> osmo-build-dep.sh libosmo-abis</span><br><span> osmo-build-dep.sh libosmo-netif</span><br><span> osmo-build-dep.sh libosmo-sccp</span><br><span> osmo-build-dep.sh osmo-mgw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Additional configure options and depends</span><br><span style="color: hsl(120, 100%, 40%);">+CONFIG=""</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$WITH_MANUALS" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-build-dep.sh osmo-gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+ CONFIG="--enable-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> set +x</span><br><span> echo</span><br><span> echo</span><br><span>@@ -40,13 +53,17 @@</span><br><span> </span><br><span> cd "$base"</span><br><span> autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">-./configure --enable-sanitize --enable-external-tests --enable-werror</span><br><span style="color: hsl(120, 100%, 40%);">+./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> LD_LIBRARY_PATH="$inst/lib" $MAKE check \</span><br><span> || cat-testlogs.sh</span><br><span> LD_LIBRARY_PATH="$inst/lib" \</span><br><span style="color: hsl(0, 100%, 40%);">- DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \</span><br><span style="color: hsl(120, 100%, 40%);">+ DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \</span><br><span> $MAKE distcheck \</span><br><span> || cat-testlogs.sh</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ make -C "$base/doc/manuals" publish</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo-clean-workspace.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11972">change 11972</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11972"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ief6ce94013612a968183e82abef421f116ed37c3 </div>
<div style="display:none"> Gerrit-Change-Number: 11972 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>