<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11999">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;">manuals/OsmoNITB: integrate into this repository<br><br>Move from doc/manuals to manuals/OsmoNITB as we have two more manuals<br>(OsmoMGCP and OsmoNAT) that need to be moved to manuals/. Make the<br>manuals build without a toplevel configure.ac file from autotools:<br><br>$ cd manuals/OsmoNITB<br>$ make<br><br>openbsc/configure.ac is not used to integrate the manuals, as it would<br>be extra effort to integrate all three of the manuals there. This is<br>not worth it for the legacy codebase.<br><br>Related: OS#3385<br>Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9<br>---<br>A manuals/.gitignore<br>R manuals/OsmoNITB/Makefile<br>R manuals/OsmoNITB/chapters/bts-examples.adoc<br>R manuals/OsmoNITB/chapters/control.adoc<br>R manuals/OsmoNITB/chapters/hlr.adoc<br>R manuals/OsmoNITB/chapters/net.adoc<br>R manuals/OsmoNITB/chapters/overview.adoc<br>R manuals/OsmoNITB/chapters/running.adoc<br>R manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml<br>R manuals/OsmoNITB/osmonitb-usermanual.adoc<br>R manuals/OsmoNITB/osmonitb-vty-reference.xml<br>R manuals/OsmoNITB/vty/bsc_vty_additions.xml<br>R manuals/OsmoNITB/vty/nitb_vty_additions.xml<br>R manuals/OsmoNITB/vty/nitb_vty_reference.xml<br>A manuals/osmo-gsm-manuals-dir.sh<br>15 files changed, 36 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/manuals/.gitignore b/manuals/.gitignore</span><br><span>new file mode 100644</span><br><span>index 0000000..565590f</span><br><span>--- /dev/null</span><br><span>+++ b/manuals/.gitignore</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+*.html</span><br><span style="color: hsl(120, 100%, 40%);">+*.svg</span><br><span style="color: hsl(120, 100%, 40%);">+*.pdf</span><br><span style="color: hsl(120, 100%, 40%);">+*__*.png</span><br><span style="color: hsl(120, 100%, 40%);">+*.check</span><br><span style="color: hsl(120, 100%, 40%);">+generated</span><br><span style="color: hsl(120, 100%, 40%);">+common</span><br><span style="color: hsl(120, 100%, 40%);">+build</span><br><span>diff --git a/doc/manuals/Makefile.am b/manuals/OsmoNITB/Makefile</span><br><span>similarity index 65%</span><br><span>rename from doc/manuals/Makefile.am</span><br><span>rename to manuals/OsmoNITB/Makefile</span><br><span>index 3735c5b..9f28305 100644</span><br><span>--- a/doc/manuals/Makefile.am</span><br><span>+++ b/manuals/OsmoNITB/Makefile</span><br><span>@@ -1,9 +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 = osmonitb-usermanual.adoc \</span><br><span style="color: hsl(0, 100%, 40%);">- osmonitb-usermanual-docinfo.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- osmonitb-vty-reference.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- chapters \</span><br><span style="color: hsl(0, 100%, 40%);">- vty</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 = osmonitb-usermanual.adoc</span><br><span> ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc</span><br><span>diff --git a/doc/manuals/chapters/bts-examples.adoc b/manuals/OsmoNITB/chapters/bts-examples.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/bts-examples.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/bts-examples.adoc</span><br><span>diff --git a/doc/manuals/chapters/control.adoc b/manuals/OsmoNITB/chapters/control.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/control.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/control.adoc</span><br><span>diff --git a/doc/manuals/chapters/hlr.adoc b/manuals/OsmoNITB/chapters/hlr.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/hlr.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/hlr.adoc</span><br><span>diff --git a/doc/manuals/chapters/net.adoc b/manuals/OsmoNITB/chapters/net.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/net.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/net.adoc</span><br><span>diff --git a/doc/manuals/chapters/overview.adoc b/manuals/OsmoNITB/chapters/overview.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/overview.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/overview.adoc</span><br><span>diff --git a/doc/manuals/chapters/running.adoc b/manuals/OsmoNITB/chapters/running.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/chapters/running.adoc</span><br><span>rename to manuals/OsmoNITB/chapters/running.adoc</span><br><span>diff --git a/doc/manuals/osmonitb-usermanual-docinfo.xml b/manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/osmonitb-usermanual-docinfo.xml</span><br><span>rename to manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml</span><br><span>diff --git a/doc/manuals/osmonitb-usermanual.adoc b/manuals/OsmoNITB/osmonitb-usermanual.adoc</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/osmonitb-usermanual.adoc</span><br><span>rename to manuals/OsmoNITB/osmonitb-usermanual.adoc</span><br><span>diff --git a/doc/manuals/osmonitb-vty-reference.xml b/manuals/OsmoNITB/osmonitb-vty-reference.xml</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/osmonitb-vty-reference.xml</span><br><span>rename to manuals/OsmoNITB/osmonitb-vty-reference.xml</span><br><span>diff --git a/doc/manuals/vty/bsc_vty_additions.xml b/manuals/OsmoNITB/vty/bsc_vty_additions.xml</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/vty/bsc_vty_additions.xml</span><br><span>rename to manuals/OsmoNITB/vty/bsc_vty_additions.xml</span><br><span>diff --git a/doc/manuals/vty/nitb_vty_additions.xml b/manuals/OsmoNITB/vty/nitb_vty_additions.xml</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/vty/nitb_vty_additions.xml</span><br><span>rename to manuals/OsmoNITB/vty/nitb_vty_additions.xml</span><br><span>diff --git a/doc/manuals/vty/nitb_vty_reference.xml b/manuals/OsmoNITB/vty/nitb_vty_reference.xml</span><br><span>similarity index 100%</span><br><span>rename from doc/manuals/vty/nitb_vty_reference.xml</span><br><span>rename to manuals/OsmoNITB/vty/nitb_vty_reference.xml</span><br><span>diff --git a/manuals/osmo-gsm-manuals-dir.sh b/manuals/osmo-gsm-manuals-dir.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..d080bc7</span><br><span>--- /dev/null</span><br><span>+++ b/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/11999">change 11999</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/11999"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 </div>
<div style="display:none"> Gerrit-Change-Number: 11999 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>