<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11998">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">doc/manuals: integrate into this repository<br><br>Update .gitignore and make the manuals build without a toplevel<br>configure.ac file from autotools:<br><br>$ cd doc/manuals<br>$ make<br><br>Related: OS#3385<br>Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1<br>---<br>M .gitignore<br>R doc/manuals/Makefile<br>A doc/manuals/osmo-gsm-manuals-dir.sh<br>3 files changed, 38 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/.gitignore b/.gitignore</span><br><span>index 1a01c26..2232749 100644</span><br><span>--- a/.gitignore</span><br><span>+++ b/.gitignore</span><br><span>@@ -31,3 +31,13 @@</span><br><span> /.project</span><br><span> /.settings/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# manuals</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/*.html</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/*.svg</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/*.pdf</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/*__*.png</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/*.check</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/generated/</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/osmocombb-usermanual.xml</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/common</span><br><span style="color: hsl(120, 100%, 40%);">+doc/manuals/build</span><br><span>diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile</span><br><span>similarity index 61%</span><br><span>rename from doc/manuals/Makefile.am</span><br><span>rename to doc/manuals/Makefile</span><br><span>index 61ccafa..603f4ba 100644</span><br><span>--- a/doc/manuals/Makefile.am</span><br><span>+++ b/doc/manuals/Makefile</span><br><span>@@ -1,7 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-OSMO_GSM_MANUALS_DIR = $(top_srcdir)</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_DIST = osmocombb-usermanual.adoc \</span><br><span style="color: hsl(0, 100%, 40%);">- osmocombb-usermanual-docinfo.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- chapters</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_GSM_MANUALS_DIR := $(shell ./osmo-gsm-manuals-dir.sh)</span><br><span style="color: hsl(120, 100%, 40%);">+srcdir=$(CURDIR)</span><br><span> </span><br><span> ASCIIDOC = osmocombb-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc</span><br><span>diff --git a/doc/manuals/osmo-gsm-manuals-dir.sh b/doc/manuals/osmo-gsm-manuals-dir.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..f132eaa</span><br><span>--- /dev/null</span><br><span>+++ b/doc/manuals/osmo-gsm-manuals-dir.sh</span><br><span>@@ -0,0 +1,26 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Find it in env, pkg-conf and ../../../osmo-gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+RET="$OSMO_GSM_MANUALS_DIR"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -n "$RET" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ RET="$(realpath $RET)"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -n "$RET" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ RET="$(realpath $(realpath $(dirname $0))/../../../osmo-gsm-manuals)"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</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%);">+# Print the result or error message</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -d "$RET" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$RET"</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11998">change 11998</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/11998"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifc2349bc2855b55cc1e603b79dc769c55a110aa1 </div>
<div style="display:none"> Gerrit-Change-Number: 11998 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>