[M] Change in osmo-ci[master]: scripts/manuals: use new method for removing DRAFT

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40343?usp=email ) Change subject: scripts/manuals: use new method for removing DRAFT ...................................................................... scripts/manuals: use new method for removing DRAFT osmo-gsm-manuals now has two "ASCIIDOCSTYLE" files: * custom-dblatex.sty (without draft) * custom-dblatex-draft.sty (new default) This change was necessary to make it feasible to build the manuals inside the debian binary packages without the watermark for the osmocom:latest feed (see next patch). Adjust the method for removing the "DRAFT" watermark: instead of patching custom-dblatex.sty, switch from custom-dblatex-draft.sty to custom-dblatex.sty. Depends: osmo-gsm-manuals I33d67748b1e97578f4726009ac73fd0c4e7305db Change-Id: I25060baa41c08fd3e25d5ff0b460d171ee2979ad --- D scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch A scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch M scripts/manuals/publish-manuals-for-tags.sh 3 files changed, 31 insertions(+), 33 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch deleted file mode 100644 index 2addeb4..0000000 --- a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 92a645d74fde8b86ab0a8f6e3d089a0f1edc34d0 Mon Sep 17 00:00:00 2001 -From: Oliver Smith &lt;osmith(a)sysmocom.de&gt; -Date: Wed, 8 Mar 2023 17:48:17 +0100 -Subject: [PATCH] build/custom-dblatex.sty: remove DRAFT - -This patch will be used when generating manuals for the tagged -releases, so they don't have the draft watermark. - -Related: OS#5902 -Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 ---- - build/custom-dblatex.sty | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty -index 16931ad..0d53bb1 100644 ---- a/build/custom-dblatex.sty -+++ b/build/custom-dblatex.sty -@@ -20,10 +20,6 @@ - \usepackage{alltt} - \usepackage{upquote} - --% "DRAFT" on first page --\definecolor{LtGrey}{rgb}{0.875,0.875,0.875} --\AddToShipoutPicture*{ \AtTextCenter{ \makebox(0,0)[c]{\resizebox{\textwidth}{!}{ \rotatebox{45}{\textsf{\textbf{\color{LtGrey}DRAFT}}}}} } } -- - \def\Company{sysmocom - s.f.m.c. GmbH} - - \def\DBKcover{ --- -2.34.1 - diff --git a/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch b/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch new file mode 100644 index 0000000..d4ce792 --- /dev/null +++ b/scripts/manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch @@ -0,0 +1,30 @@ +From 3c3eb37a11e1cfae9a41d702d3ad0ee8c6517f01 Mon Sep 17 00:00:00 2001 +From: Oliver Smith &lt;osmith(a)sysmocom.de&gt; +Date: Wed, 21 May 2025 12:59:01 +0200 +Subject: [PATCH] build: set ASCIIDOCSTYLE to remove DRAFT + +This patch will be used when generating manuals for the tagged +releases, so they don't have the draft watermark. + +Related: OS#5902 +Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 +--- + build/Makefile.asciidoc.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc +index eb6df99..e2e8ad2 100644 +--- a/build/Makefile.asciidoc.inc ++++ b/build/Makefile.asciidoc.inc +@@ -27,7 +27,7 @@ ASCIIDOC_NAME = $(patsubst %.adoc,%,$(ASCIIDOC)) + ASCIIDOC_PDF = $(ASCIIDOC_NAME:%=%.pdf) + ASCIIDOC_CHECKS = $(ASCIIDOC_NAME:%=%.check) + +-ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex-draft.sty ++ASCIIDOCSTYLE ?= $(BUILDDIR)/custom-dblatex.sty + + CLEAN_FILES += $(ASCIIDOC_NAME:%=%__*.png) $(ASCIIDOC_NAME:%=%__*.svg) $(ASCIIDOC_CHECKS) + CLEAN_FILES += $(ASCIIDOC_PDF) $(ASCIIDOC_NAME:%=%.html) +-- +2.43.0 + diff --git a/scripts/manuals/publish-manuals-for-tags.sh b/scripts/manuals/publish-manuals-for-tags.sh index 902019b..f543ab6 100755 --- a/scripts/manuals/publish-manuals-for-tags.sh +++ b/scripts/manuals/publish-manuals-for-tags.sh @@ -406,7 +406,7 @@ # Remove DRAFT in osmo-gsm-manuals cd /opt/osmo-gsm-manuals/ - patch -p1 < /manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch + patch -p1 < /manuals/0001-build-set-ASCIIDOCSTYLE-to-remove-DRAFT.patch # Build manuals cd /build -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40343?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I25060baa41c08fd3e25d5ff0b460d171ee2979ad Gerrit-Change-Number: 40343 Gerrit-PatchSet: 2 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt;