osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/11801 )
Change subject: vty_reference_combine.sh: add *reference.xml arg
......................................................................
vty_reference_combine.sh: add *reference.xml arg
Pass the path to $(srcdir)/vty/*reference.xml as parameter to
vty_reference_combine.sh instead of assuming that it will be in
./vty/*reference.xml.
This is necessary to make the build scripts work for out-of-tree
builds. Because when building out-of-tree, the source dir and build dir
(the one where the Makefile gets generated, and in which "make" runs),
are not the same anymore. The relative vty/reference.xml path is only
valid in the source dir, not in the build dir. The next commits in this
series have more changes for out-of-tree builds.
Out-of-tree building is necessary for consistency with the other
Osmocom code, which can be built out-of-tree as well. It would be
strange if this did not work anymore as soon as the users enabled
building the manuals.
(moving manuals to project repositories 10/19)
Related: OS#3385
Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c
---
M build/Makefile.vty-reference.inc
M build/vty_reference_combine.sh
2 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc
index af5388c..cb00648 100644
--- a/build/Makefile.vty-reference.inc
+++ b/build/Makefile.vty-reference.inc
@@ -37,6 +37,7 @@
$(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \
$(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl
$(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \
+ $(srcdir)/vty/*reference.xml \
$(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
vty/*additions*.xml
xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl
generated/combined.xml \
diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh
index be234a7..cb18e9e 100755
--- a/build/vty_reference_combine.sh
+++ b/build/vty_reference_combine.sh
@@ -1,16 +1,20 @@
#!/bin/sh
+# usage: vty_reference_combine.sh path/to/merge_doc.xsl path/to/*reference.xml
[paths to additional xmls]
+# see Makefile.vty-reference.inc
set -e
-# the first argument should point at libosmocore/doc/vty/merge_doc.xsl
+# first argument: merge_doc.xsl
MERGE_DOC="$1"
shift
+# second argument: *reference.xml
+reference="$1"
+test "$(ls -1 $reference | wc -l)" = "1"
+shift
+
combined="generated/combined.xml"
combine_src="generated/combine_src.xml"
-reference="vty/*reference.xml"
-test "$(ls -1 $reference | wc -l)" = "1"
-
set -x
mkdir -p generated
cp $reference "$combined"
--
To view, visit https://gerrit.osmocom.org/11801
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dcb49d7705f882bd117088d4e5eab91dd1c7d8c
Gerrit-Change-Number: 11801
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
