This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/11999 ) Change subject: manuals/OsmoNITB: integrate into this repository ...................................................................... manuals/OsmoNITB: integrate into this repository Move from doc/manuals to manuals/OsmoNITB as we have two more manuals (OsmoMGCP and OsmoNAT) that need to be moved to manuals/. Make the manuals build without a toplevel configure.ac file from autotools: $ cd manuals/OsmoNITB $ make openbsc/configure.ac is not used to integrate the manuals, as it would be extra effort to integrate all three of the manuals there. This is not worth it for the legacy codebase. Related: OS#3385 Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 --- A manuals/.gitignore R manuals/OsmoNITB/Makefile R manuals/OsmoNITB/chapters/bts-examples.adoc R manuals/OsmoNITB/chapters/control.adoc R manuals/OsmoNITB/chapters/hlr.adoc R manuals/OsmoNITB/chapters/net.adoc R manuals/OsmoNITB/chapters/overview.adoc R manuals/OsmoNITB/chapters/running.adoc R manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml R manuals/OsmoNITB/osmonitb-usermanual.adoc R manuals/OsmoNITB/osmonitb-vty-reference.xml R manuals/OsmoNITB/vty/bsc_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_additions.xml R manuals/OsmoNITB/vty/nitb_vty_reference.xml A manuals/osmo-gsm-manuals-dir.sh 15 files changed, 36 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/manuals/.gitignore b/manuals/.gitignore new file mode 100644 index 0000000..565590f --- /dev/null +++ b/manuals/.gitignore @@ -0,0 +1,8 @@ +*.html +*.svg +*.pdf +*__*.png +*.check +generated +common +build diff --git a/doc/manuals/Makefile.am b/manuals/OsmoNITB/Makefile similarity index 65% rename from doc/manuals/Makefile.am rename to manuals/OsmoNITB/Makefile index 3735c5b..9f28305 100644 --- a/doc/manuals/Makefile.am +++ b/manuals/OsmoNITB/Makefile @@ -1,9 +1,5 @@ -OSMO_GSM_MANUALS_DIR = $(top_srcdir) -EXTRA_DIST = osmonitb-usermanual.adoc \ - osmonitb-usermanual-docinfo.xml \ - osmonitb-vty-reference.xml \ - chapters \ - vty +OSMO_GSM_MANUALS_DIR := $(shell ../osmo-gsm-manuals-dir.sh) +srcdir=$(CURDIR) ASCIIDOC = osmonitb-usermanual.adoc ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc diff --git a/doc/manuals/chapters/bts-examples.adoc b/manuals/OsmoNITB/chapters/bts-examples.adoc similarity index 100% rename from doc/manuals/chapters/bts-examples.adoc rename to manuals/OsmoNITB/chapters/bts-examples.adoc diff --git a/doc/manuals/chapters/control.adoc b/manuals/OsmoNITB/chapters/control.adoc similarity index 100% rename from doc/manuals/chapters/control.adoc rename to manuals/OsmoNITB/chapters/control.adoc diff --git a/doc/manuals/chapters/hlr.adoc b/manuals/OsmoNITB/chapters/hlr.adoc similarity index 100% rename from doc/manuals/chapters/hlr.adoc rename to manuals/OsmoNITB/chapters/hlr.adoc diff --git a/doc/manuals/chapters/net.adoc b/manuals/OsmoNITB/chapters/net.adoc similarity index 100% rename from doc/manuals/chapters/net.adoc rename to manuals/OsmoNITB/chapters/net.adoc diff --git a/doc/manuals/chapters/overview.adoc b/manuals/OsmoNITB/chapters/overview.adoc similarity index 100% rename from doc/manuals/chapters/overview.adoc rename to manuals/OsmoNITB/chapters/overview.adoc diff --git a/doc/manuals/chapters/running.adoc b/manuals/OsmoNITB/chapters/running.adoc similarity index 100% rename from doc/manuals/chapters/running.adoc rename to manuals/OsmoNITB/chapters/running.adoc diff --git a/doc/manuals/osmonitb-usermanual-docinfo.xml b/manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml similarity index 100% rename from doc/manuals/osmonitb-usermanual-docinfo.xml rename to manuals/OsmoNITB/osmonitb-usermanual-docinfo.xml diff --git a/doc/manuals/osmonitb-usermanual.adoc b/manuals/OsmoNITB/osmonitb-usermanual.adoc similarity index 100% rename from doc/manuals/osmonitb-usermanual.adoc rename to manuals/OsmoNITB/osmonitb-usermanual.adoc diff --git a/doc/manuals/osmonitb-vty-reference.xml b/manuals/OsmoNITB/osmonitb-vty-reference.xml similarity index 100% rename from doc/manuals/osmonitb-vty-reference.xml rename to manuals/OsmoNITB/osmonitb-vty-reference.xml diff --git a/doc/manuals/vty/bsc_vty_additions.xml b/manuals/OsmoNITB/vty/bsc_vty_additions.xml similarity index 100% rename from doc/manuals/vty/bsc_vty_additions.xml rename to manuals/OsmoNITB/vty/bsc_vty_additions.xml diff --git a/doc/manuals/vty/nitb_vty_additions.xml b/manuals/OsmoNITB/vty/nitb_vty_additions.xml similarity index 100% rename from doc/manuals/vty/nitb_vty_additions.xml rename to manuals/OsmoNITB/vty/nitb_vty_additions.xml diff --git a/doc/manuals/vty/nitb_vty_reference.xml b/manuals/OsmoNITB/vty/nitb_vty_reference.xml similarity index 100% rename from doc/manuals/vty/nitb_vty_reference.xml rename to manuals/OsmoNITB/vty/nitb_vty_reference.xml diff --git a/manuals/osmo-gsm-manuals-dir.sh b/manuals/osmo-gsm-manuals-dir.sh new file mode 100755 index 0000000..d080bc7 --- /dev/null +++ b/manuals/osmo-gsm-manuals-dir.sh @@ -0,0 +1,26 @@ +#!/bin/sh -e +# Find OSMO_GSM_MANUALS_DIR and print it to stdout. Print where it was taken from to stderr. + +# Find it in env, pkg-conf and ../../osmo-gsm-manuals +RET="$OSMO_GSM_MANUALS_DIR" +if [ -n "$RET" ]; then + RET="$(realpath $RET)" + echo "OSMO_GSM_MANUALS_DIR: $RET (from env)" >&2 +else + RET="$(pkg-config osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null || true)" + if [ -n "$RET" ]; then + echo "OSMO_GSM_MANUALS_DIR: $RET (from pkg-conf)" >&2 + else + RET="$(realpath $(realpath $(dirname $0))/../../osmo-gsm-manuals)" + echo "OSMO_GSM_MANUALS_DIR: $RET (fallback)" >&2 + fi +fi + +# Print the result or error message +if [ -d "$RET" ]; then + echo "$RET" +else + echo "ERROR: OSMO_GSM_MANUALS_DIR does not exist!" >&2 + echo "Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR." >&2 + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/11999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0036ad8dbecd23695305ac491c7ee87caa44c7f9 Gerrit-Change-Number: 11999 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: osmith <osmith at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181129/0a158832/attachment.htm>