From dec39cdea98804e63e6e6c8361ae4b94d0139ede Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 14 Nov 2018 10:47:01 +0100 Subject: s/TOPDIR/OSMO_GSM_MANUALS_DIR/g Replace TOPDIR with OSMO_GSM_MANUALS_DIR. When the project specific manuals will be built out of this repository, we still need to refer to the top directory of the shared content. But it will be in another repository, so we need to rename the variable to avoid confusion. (moving manuals to project repositories 3/19) Related: OS#3385 Change-Id: I2af797546de048a6ab19a5cbc755e5e15575d7ab --- build/Makefile.asciidoc.inc | 16 ++++++++-------- build/Makefile.docbook.inc | 6 +++--- build/Makefile.vty-reference.inc | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'build') diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc index c2b0961..2cd7d50 100644 --- a/build/Makefile.asciidoc.inc +++ b/build/Makefile.asciidoc.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'ASCIIDOC' all root .adoc files, # - optionally define in 'ASCIIDOC_DEPS' all dependencies common to all .adocs, # - include this file, @@ -8,16 +8,16 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # ASCIIDOC = osmo_yada.adoc osmo_moo.adoc # ASCIIDOC_DEPS = for_all/*.adoc -# include $(TOPDIR)/build/Makefile.asciidoc.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc # osmo_yada.pdf: yada/*.adoc yada/*.msc -BUILDDIR = $(TOPDIR)/build +BUILDDIR = $(OSMO_GSM_MANUALS_DIR)/build GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) -GIT_DATE := $(shell $(TOPDIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) +GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`) # prepend the document name with the version numbe suffix #DOCS_VER = $(foreach P, $(ASCIIDOC_NAME), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null)) @@ -51,8 +51,8 @@ all: $(ASCIIDOC_PDF) $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ $(ASCIIDOC_DEPS) \ $(ASCIIDOCSTYLE) \ - $(TOPDIR)/common/*/*.adoc \ - $(TOPDIR)/common/images/* + $(OSMO_GSM_MANUALS_DIR)/common/*/*.adoc \ + $(OSMO_GSM_MANUALS_DIR)/common/images/* @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ and remove three lines starting with '% \"DRAFT\" on first page'\n" \ @@ -62,7 +62,7 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ check: $(ASCIIDOC_CHECKS) -$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(TOPDIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) +$(ASCIIDOC_CHECKS): %.check: %.adoc %-docinfo.xml $(ASCIIDOCSTYLE) $(OSMO_GSM_MANUALS_DIR)/common/chapters/*.adoc $(ASCIIDOC_DEPS) asciidoc -v $(ASCIIDOC_OPTS) $< > $@ 2>&1 # Make absolutely sure that the %.check target is updated. touch $@ diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 70dfafa..acf410e 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -1,6 +1,6 @@ # USAGE: # -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define in 'DOCBOOKS' all root .xml files, # - optionally define in 'DOCBOOKS_DEPS' all dependencies common to all .xmls, # - include this file, @@ -8,10 +8,10 @@ # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # DOCBOOKS = osmo_yada.xml osmo_moo.xml # ASCIIDOC_DEPS = for_all/*.xml -# include $(TOPDIR)/build/Makefile.docbook.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc # osmo_yada.pdf: yada/*.xml # # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc index 1528d32..659f26c 100644 --- a/build/Makefile.vty-reference.inc +++ b/build/Makefile.vty-reference.inc @@ -8,34 +8,34 @@ # Export from VTY 'show online-help', exactly one file. # # In your Makefile, -# - define 'TOPDIR' to point at the git root, +# - define 'OSMO_GSM_MANUALS_DIR' to point at the git root, # - define the (single) name of the vty-reference source in VTY_REFERENCE, # - include this file. # # e.g. # -# TOPDIR = .. +# OSMO_GSM_MANUALS_DIR = .. # VTY_REFERENCE = osmofoo-vty-reference -# include $(TOPDIR)/build/Makefile.vty-reference.inc +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc # # This uses the Makefile.docbook.inc, you should not mix uses of # Makefile.vty-reference.inc and Makefile.docbook.inc. DOCBOOKS = $(VTY_REFERENCE) DOCBOOKS_DEPS = generated/docbook_vty.xml -include $(TOPDIR)/build/Makefile.docbook.inc +include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.docbook.inc -MERGE_DOC = $(shell realpath $(TOPDIR)/merge_doc.xsl) +MERGE_DOC = $(shell realpath $(OSMO_GSM_MANUALS_DIR)/merge_doc.xsl) CLEAN_FILES += generated generated/docbook_vty.xml: \ vty/*xml \ - $(TOPDIR)/common/vty_additions.xml \ - $(TOPDIR)/common/chapters/vty.xml \ - $(TOPDIR)/vty_reference.xsl - $(TOPDIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \ - $(TOPDIR)/common/vty_additions.xml \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ + $(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)" \ + $(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \ vty/*additions*.xml - xsltproc $(TOPDIR)/vty_reference.xsl generated/combined.xml \ + xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl generated/combined.xml \ > generated/docbook_vty.xml -- cgit v1.2.3