Change in ...osmo-iuh[master]: jenkins: Enable manual publishing and building

daniel gerrit-no-reply at lists.osmocom.org
Tue Jul 30 14:06:20 UTC 2019


daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/14991 )

Change subject: jenkins: Enable manual publishing and building
......................................................................

jenkins: Enable manual publishing and building

Related: OS#2589
Change-Id: Ic7437daeab0b07d16fd71ca3881cb31bab7b1925
---
M contrib/jenkins.sh
1 file changed, 13 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  laforge: Looks good to me, approved



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 5754f2c..ac7363e 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,7 @@
 
 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
@@ -25,6 +26,12 @@
 # the asn1c binary is used by the 'regen' target below
 osmo-build-dep.sh asn1c aper-prefix
 
+CONFIG=""
+if [ "$WITH_MANUALS" = "1" ]; then
+	osmo-build-dep.sh osmo-gsm-manuals
+	CONFIG="--enable-manuals"
+fi
+
 set +x
 echo
 echo
@@ -34,7 +41,7 @@
 set -x
 
 autoreconf --install --force
-./configure --enable-sanitize
+./configure --enable-sanitize $CONFIG
 
 # Verify that checked-in asn1 code is identical to regenerated asn1 code
 PATH="$inst/bin:$PATH" $MAKE $PARALLEL_MAKE -C src regen
@@ -55,6 +62,10 @@
   || cat-testlogs.sh
 $MAKE distcheck \
   || cat-testlogs.sh
-$MAKE maintainer-clean
 
+if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
+	make -C "$base/doc/manuals" publish
+fi
+
+$MAKE maintainer-clean
 osmo-clean-workspace.sh

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/14991
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: Ic7437daeab0b07d16fd71ca3881cb31bab7b1925
Gerrit-Change-Number: 14991
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190730/1aa12452/attachment.html>


More information about the gerrit-log mailing list