<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17368">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins.sh: Harmonize with what we do in other projects<br><br>most importantly:<br>* conditional build of manuals<br>* enforce build of manuals if enabled<br>* publish manuals, if requested<br><br>Change-Id: I4ed51fd5aa9d861ea4795e33b6201c15b2281b53<br>---<br>M contrib/jenkins.sh<br>1 file changed, 23 insertions(+), 3 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 347ea9b..30db3d7 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> #!/bin/sh</span><br><span> # jenkins build helper script for libosmo-abis.  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>@@ -21,12 +26,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 libosmocore "" --disable-doxygen</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 simtrace2</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>@@ -35,11 +48,18 @@</span><br><span> echo</span><br><span> set -x</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+cd "$base"</span><br><span> autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">-./configure --enable-sanitize #--enable-werror</span><br><span style="color: hsl(120, 100%, 40%);">+./configure --enable-sanitize --enable-werror $CONFIG</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span style="color: hsl(0, 100%, 40%);">-$MAKE distcheck \</span><br><span style="color: hsl(120, 100%, 40%);">+LD_LIBRARY_PATH="$inst/lib" \</span><br><span style="color: hsl(120, 100%, 40%);">+  DISTCHCK_CONFIGURE_FLAGS="--enable-werror $CONFIG" \</span><br><span style="color: hsl(120, 100%, 40%);">+  $MAKE distcheck \</span><br><span>   || cat-testlogs.sh</span><br><span style="color: hsl(0, 100%, 40%);">-$MAKE maintainer-clean</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 style="color: hsl(120, 100%, 40%);">+$MAKE maintainer-clean</span><br><span> osmo-clean-workspace.sh</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17368">change 17368</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/c/osmo-remsim/+/17368"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4ed51fd5aa9d861ea4795e33b6201c15b2281b53 </div>
<div style="display:none"> Gerrit-Change-Number: 17368 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>