<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20951">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Makefile.vty-reference.inc: create 'generated' in this file<br><br>Ideally, 'vty_reference_combine.sh' should not create any files<br>nor directories on its own; it should do exactly what its name<br>suggests - combine several XML files into a single one.<br><br>Let's first make the target directory ('generated') creation a<br>task of 'Makefile.vty-reference.inc', and then make it output<br>the results to stdout in a follow-up change.<br><br>Change-Id: Iabe729af22c235cf9c4b252acda99b43ebcae20c<br>Related: SYS#4937<br>---<br>M build/Makefile.vty-reference.inc<br>M build/vty_reference_combine.sh<br>2 files changed, 16 insertions(+), 12 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 c1db67b..9e22925 100644</span><br><span>--- a/build/Makefile.vty-reference.inc</span><br><span>+++ b/build/Makefile.vty-reference.inc</span><br><span>@@ -49,47 +49,52 @@</span><br><span> </span><br><span> DOCBOOKS = $(VTY_REFERENCE)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# First VTY reference</span><br><span style="color: hsl(0, 100%, 40%);">-DOCBOOKS_DEPS = generated/docbook_vty.xml</span><br><span style="color: hsl(120, 100%, 40%);">+# Directory for intermediate results</span><br><span style="color: hsl(120, 100%, 40%);">+GEN_DIR = generated</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Additional VTY references: prepend "generated/docbook_"</span><br><span style="color: hsl(120, 100%, 40%);">+# First VTY reference</span><br><span style="color: hsl(120, 100%, 40%);">+DOCBOOKS_DEPS = $(GEN_DIR)/docbook_vty.xml</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Additional VTY references: prepend "$(GEN_DIR)/docbook_"</span><br><span> # For example:</span><br><span> # VTY_REFERENCE = osmosgsn-vty-reference.xml osmogbproxy-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-# DOCBOOK_DEPS = generated/docbook_vty.xml generated/docbook_osmogbproxy-vty-reference.xml</span><br><span style="color: hsl(0, 100%, 40%);">-DOCBOOKS_DEPS += $(patsubst %,generated/docbook_%,$(filter-out $(firstword $(VTY_REFERENCE)),$(VTY_REFERENCE)))</span><br><span style="color: hsl(120, 100%, 40%);">+# DOCBOOK_DEPS = $(GEN_DIR)/docbook_vty.xml $(GEN_DIR)/docbook_osmogbproxy-vty-reference.xml</span><br><span style="color: hsl(120, 100%, 40%);">+DOCBOOKS_DEPS += $(patsubst %,$(GEN_DIR)/docbook_%,$(filter-out $(firstword $(VTY_REFERENCE)),$(VTY_REFERENCE)))</span><br><span> </span><br><span> include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc</span><br><span> </span><br><span> MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CLEAN_FILES += generated</span><br><span style="color: hsl(120, 100%, 40%);">+CLEAN_FILES += $(GEN_DIR)</span><br><span> CLEAN_FILES += $(BUILT_REFERENCE_XML)</span><br><span> </span><br><span> # First VTY reference</span><br><span style="color: hsl(0, 100%, 40%);">-generated/docbook_vty.xml: \</span><br><span style="color: hsl(120, 100%, 40%);">+$(GEN_DIR)/docbook_vty.xml: \</span><br><span> $(srcdir)/vty/*xml \</span><br><span> $(BUILT_REFERENCE_XML) \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p $(GEN_DIR)</span><br><span> $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \</span><br><span> $$($(OSMO_GSM_MANUALS_DIR)/build/find_existing_path.sh "vty/*reference.xml" $(builddir) $(srcdir)) \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span> $(srcdir)/vty/*additions*.xml</span><br><span style="color: hsl(0, 100%, 40%);">- xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \</span><br><span style="color: hsl(0, 100%, 40%);">- > generated/docbook_vty.xml</span><br><span style="color: hsl(120, 100%, 40%);">+ xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl $(GEN_DIR)/combined.xml \</span><br><span style="color: hsl(120, 100%, 40%);">+ > $(GEN_DIR)/docbook_vty.xml</span><br><span> </span><br><span> # Additional VTY references</span><br><span style="color: hsl(0, 100%, 40%);">-generated/docbook_%-vty-reference.xml: \</span><br><span style="color: hsl(120, 100%, 40%);">+$(GEN_DIR)/docbook_%-vty-reference.xml: \</span><br><span> $(srcdir)/vty-%/*xml \</span><br><span> $(BUILT_REFERENCE_XML) \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/chapters/vty.xml \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl</span><br><span style="color: hsl(0, 100%, 40%);">- export VTYDIR_NAME="vty-$(patsubst generated/docbook_%-vty-reference.xml,%,$@)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ export VTYDIR_NAME="vty-$(patsubst $(GEN_DIR)/docbook_%-vty-reference.xml,%,$@)" && \</span><br><span> export VTYDIR_SRC="$(srcdir)/$$VTYDIR_NAME" && \</span><br><span> export VTYDIR_BUILD="$(builddir)/$$VTYDIR_NAME" && \</span><br><span> export VTYGEN="$@_combine" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p $$VTYGEN && \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \</span><br><span> $$($(OSMO_GSM_MANUALS_DIR)/build/find_existing_path.sh "*reference.xml" $$VTYDIR_BUILD $$VTYDIR_SRC) \</span><br><span> $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \</span><br><span>diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh</span><br><span>index 6ab279e..11e84c0 100755</span><br><span>--- a/build/vty_reference_combine.sh</span><br><span>+++ b/build/vty_reference_combine.sh</span><br><span>@@ -20,7 +20,6 @@</span><br><span> combine_src="$VTYGEN/combine_src.xml"</span><br><span> </span><br><span> set -x</span><br><span style="color: hsl(0, 100%, 40%);">-mkdir -p "$VTYGEN"</span><br><span> cp $reference "$combined"</span><br><span> </span><br><span> while [ -n "$1" ]; do</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20951">change 20951</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/c/osmo-gsm-manuals/+/20951"/><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-Change-Id: Iabe729af22c235cf9c4b252acda99b43ebcae20c </div>
<div style="display:none"> Gerrit-Change-Number: 20951 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>