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/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgHello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3985 to look at the new patch set (#2). fix make deps: don't use the FORCE With the FORCE dependency in place, every 'make' invocation builds all from scratch all the time. Remove that to have intelligent re-build on edits. Change-Id: I9758e04162a480e28c7dc83475b514cf7fd25ec0 --- M OsmoBSC/Makefile M OsmoBTS/Makefile M OsmoGGSN/Makefile M OsmoMGCP/Makefile M OsmoNAT/Makefile M OsmoNITB/Makefile M OsmoPCU/Makefile M OsmoSGSN/Makefile M build/Makefile.inc 9 files changed, 19 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/85/3985/2 diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile index 35f50da..97b87ba 100644 --- a/OsmoBSC/Makefile +++ b/OsmoBSC/Makefile @@ -1,9 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals - -EXTRA_DEPS = gen-bsc-vty-docbook - topdir = . bsc_reference = $(topdir)/osmobsc-vty-reference.xml manuals = $(bsc_reference) @@ -20,7 +17,7 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmobsc-usermanual.pdf: chapters/*.adoc +osmobsc-usermanual.pdf: chapters/*.adoc generated/docbook_vty.xml osmux-reference.pdf: osmux-reference.adoc aoip-mgw-options.pdf: aoip-mgw-options.adoc @@ -37,7 +34,7 @@ -rm osmux-reference__*.png -rm osmux-reference__*.check -gen-bsc-vty-docbook: FORCE +generated/docbook_vty.xml: osmobsc-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/bsc_vty_reference.xml, \ diff --git a/OsmoBTS/Makefile b/OsmoBTS/Makefile index 58df0e3..58b8250 100644 --- a/OsmoBTS/Makefile +++ b/OsmoBTS/Makefile @@ -1,8 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-bts-vty-docbook - topdir = . bts_reference = $(topdir)/osmobts-vty-reference.xml manuals = $(bts_reference) @@ -19,7 +17,7 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmobts-abis.pdf: abis/*.adoc abis/*.msc +osmobts-abis.pdf: abis/*.adoc abis/*.msc generated/docbook_vty.xml osmobts-usermanual.pdf: chapters/*.adoc clean: @@ -33,7 +31,7 @@ -rm osmobts-abis*.check -rm osmobts-usermanual*.check -gen-bts-vty-docbook: FORCE +generated/docbook_vty.xml: osmobts-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/bts_vty_reference.xml, \ diff --git a/OsmoGGSN/Makefile b/OsmoGGSN/Makefile index 2dfedb2..9602f55 100644 --- a/OsmoGGSN/Makefile +++ b/OsmoGGSN/Makefile @@ -1,8 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-ggsn-vty-docbook - topdir = . ggsn_reference = $(topdir)/osmoggsn-vty-reference.xml manuals = $(ggsn_reference) @@ -19,14 +17,14 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmoggsn-usermanual.pdf: chapters/*.adoc +osmoggsn-usermanual.pdf: chapters/*.adoc generated/docbook_vty.xml clean: -rm -rf $(cleanfiles) -rm osmoggsn-usermanual__*.svg osmoggsn-usermanual__*.png -rm osmoggsn-usermanual.check -gen-ggsn-vty-docbook: FORCE +generated/docbook_vty.xml: osmoggsn-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/ggsn_vty_reference.xml, \ diff --git a/OsmoMGCP/Makefile b/OsmoMGCP/Makefile index 9aff12b..8848af8 100644 --- a/OsmoMGCP/Makefile +++ b/OsmoMGCP/Makefile @@ -1,7 +1,7 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-mgcp-vty-docbook +EXTRA_DEPS = generated/docbook_vty.xml topdir = . mgcp_reference = $(topdir)/osmomgcp-vty-reference.xml @@ -18,7 +18,7 @@ clean: -rm -rf $(cleanfiles) -gen-mgcp-vty-docbook: FORCE +generated/docbook_vty.xml: osmomgcp-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/mgcp_vty_reference.xml, \ diff --git a/OsmoNAT/Makefile b/OsmoNAT/Makefile index d7302e6..fe7ed1a 100644 --- a/OsmoNAT/Makefile +++ b/OsmoNAT/Makefile @@ -1,7 +1,7 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-nat-vty-docbook +EXTRA_DEPS = generated/docbook_vty.xml topdir = . nat_reference = $(topdir)/osmonat-vty-reference.xml @@ -18,7 +18,7 @@ clean: -rm -rf $(cleanfiles) -gen-nat-vty-docbook: FORCE +generated/docbook_vty.xml: osmonat-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/nat_vty_reference.xml, \ diff --git a/OsmoNITB/Makefile b/OsmoNITB/Makefile index 99cd317..3812e5b 100644 --- a/OsmoNITB/Makefile +++ b/OsmoNITB/Makefile @@ -1,8 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-nitb-vty-docbook - topdir = . nitb_reference = $(topdir)/osmonitb-vty-reference.xml manuals = $(nitb_reference) @@ -19,7 +17,7 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmonitb-usermanual.pdf: chapters/*.adoc +osmonitb-usermanual.pdf: chapters/*.adoc generated/docbook_vty.xml clean: -rm -rf $(cleanfiles) @@ -27,7 +25,7 @@ -rm osmonitb-usermanual__*.png -rm osmonitb-usermanual.check -gen-nitb-vty-docbook: FORCE +generated/docbook_vty.xml: osmonitb-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/nitb_vty_reference.xml, \ diff --git a/OsmoPCU/Makefile b/OsmoPCU/Makefile index a83b909..5be9700 100644 --- a/OsmoPCU/Makefile +++ b/OsmoPCU/Makefile @@ -1,8 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-vty-docbook - topdir = . pcu_reference = $(topdir)/osmopcu-vty-reference.xml manuals = $(bts_manual) $(pcu_reference) @@ -19,8 +17,8 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmopcu-gb.pdf: gb/*.adoc gb/*.msc -osmopcu-usermanual.pdf: chapters/*.adoc +osmopcu-gb.pdf: gb/*.adoc gb/*.msc generated/docbook_vty.xml +osmopcu-usermanual.pdf: chapters/*.adoc generated/docbook_vty.xml clean: -rm -rf $(cleanfiles) @@ -29,7 +27,7 @@ -rm osmopcu-usermanual__*.svg -rm osmopcu-usermanual.check -gen-vty-docbook: FORCE +generated/docbook_vty.xml: osmopcu-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/osmo-pcu_vty_reference.xml, \ diff --git a/OsmoSGSN/Makefile b/OsmoSGSN/Makefile index 6f7d28d..1c01af7 100644 --- a/OsmoSGSN/Makefile +++ b/OsmoSGSN/Makefile @@ -1,8 +1,6 @@ # XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/ # Makefile from BitBake/OpenEmbedded manuals -EXTRA_DEPS = gen-sgsn-vty-docbook - topdir = . sgsn_reference = $(topdir)/osmosgsn-vty-reference.xml manuals = $(sgsn_reference) @@ -19,14 +17,14 @@ include $(TOPDIR)/build/Makefile.asciidoc.inc include $(TOPDIR)/build/Makefile.inc -osmosgsn-usermanual.pdf: chapters/*.adoc +osmosgsn-usermanual.pdf: chapters/*.adoc generated/docbook_vty.xml clean: -rm -rf $(cleanfiles) -rm osmosgsn-usermanual__*.svg osmosgsn-usermanual__*.png -rm osmosgsn-usermanual.check -gen-sgsn-vty-docbook: FORCE +generated/docbook_vty.xml: osmosgsn-vty-reference.xml vty/*xml ../common/vty_additions.xml ../vty_reference.xsl $(call command,xsltproc -o generated/combined1.xml \ --stringparam with $(PWD)/../common/vty_additions.xml \ $(MERGE_DOC) vty/sgsn_vty_reference.xml, \ diff --git a/build/Makefile.inc b/build/Makefile.inc index 3905cb0..9c17176 100644 --- a/build/Makefile.inc +++ b/build/Makefile.inc @@ -27,21 +27,16 @@ all: $(types) -$(types): FORCE - - pdf: $(pdfs) $(manuals) # Lint the file -%.xml-lint: %.xml FORCE +%.xml-lint: %.xml $(call command,xmllint --xinclude --postvalid --noout $<,XMLLINT,$<) # Create a PDF file and lint it before -%.pdf: %.xml %.xml-lint $(EXTRA_DEPS) FORCE +%.pdf: %.xml %.xml-lint $(EXTRA_DEPS) $(call command,dblatex $(dblatex_quiet) -P draft.mode=no $<,DBLATEX,$<) upload: $(pdfs) $(ASCIIDOCPDFS) rsync -avz $(pdfs) $(ASCIIDOCPDFS) $(UPLOAD_PATH)/ - -FORCE: -- To view, visit https://gerrit.osmocom.org/3985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9758e04162a480e28c7dc83475b514cf7fd25ec0 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder