Change in osmo-pcap[master]: contrib/jenkins.sh: fix: pass '--enable-manuals' to configure

laforge gerrit-no-reply at lists.osmocom.org
Sun Apr 18 22:10:25 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/23786 )

Change subject: contrib/jenkins.sh: fix: pass '--enable-manuals' to configure
......................................................................

contrib/jenkins.sh: fix: pass '--enable-manuals' to configure

Currently `make publish` fails on Jenkins because there is nothing
to publish.  In [1] we simply forgot to pass '--enable-manuals'
if $WITH_MANUALS is set to 1, so no PDFs are built.  Fix this.

Change-Id: I85dfecf2025a0466fccfe5a1e63cda788f85992e
Fixes: [1] I28353f51de798535a3bb6efdc6c2da443d96ddfb
---
M contrib/jenkins.sh
1 file changed, 13 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index ae5177f..683fb9d 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -24,6 +24,13 @@
 export LD_LIBRARY_PATH="$inst/lib"
 osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
 
+# 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
 echo
@@ -35,10 +42,14 @@
 
 cd "$base"
 autoreconf --install --force
-PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true --enable-sanitize --enable-werror
+PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure \
+	--with-pcap-config=/bin/true \
+	--enable-sanitize \
+	--enable-werror \
+	$CONFIG
 $MAKE $PARALLEL_MAKE
 $MAKE check || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \
+DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true $CONFIG" \
         PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \
         $MAKE distcheck || cat-testlogs.sh
 

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

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I85dfecf2025a0466fccfe5a1e63cda788f85992e
Gerrit-Change-Number: 23786
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210418/f0298a00/attachment.htm>


More information about the gerrit-log mailing list