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