GNU bug report logs - #53649
[PATCH] maint: include versioned manual in update

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53649 in the body.
You can then email your comments to 53649 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mike Frysinger <vapier <at> gentoo.org>
To: automake-patches <at> gnu.org
Subject: [PATCH] maint: include versioned manual in update
Date: Mon, 31 Jan 2022 02:32:24 -0500

When publishing the updated manual, include the versioned copy too,
and have their index.html link to the full version index.

* maintainer/maint.mk: Copy manual to manual/$(VERSION)/, and insert
index-full.html link into index.html.
---
 maintainer/maint.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/maintainer/maint.mk b/maintainer/maint.mk
index 7303a05cf913..9ad510845f02 100644
--- a/maintainer/maint.mk
+++ b/maintainer/maint.mk
@@ -386,6 +386,11 @@ export CVS_RSH
 .PHONY: web-manual web-manual-update
 web-manual web-manual-update: t = $@.dir
 
+MANUAL_VERSION_HTML = \
+	<p>See the <a href="index-full.html">full version index</a> for the manual for other releases of Automake.</p>
+MANUAL_VERSION_HTML_PARENT = \
+	<p>See the <a href="../index-full.html">full version index</a> for the manual for other releases of Automake.</p>
+
 # Build manual in several formats.  Note to the recipe:
 # 1. The symlinking of automake.texi into the temporary directory is
 #    required to pacify extra checks from gendocs.sh.
@@ -424,14 +429,20 @@ web-manual-update:
 	$(AM_V_at)mkdir $t
 	$(AM_V_at)cd $t \
 	  && $(CVS) -z3 -d :ext:$(CVS_USER)@$(WEBCVS_ROOT)/$(PACKAGE) \
-	            co $(PACKAGE)/manual
+	            co -l $(PACKAGE)/manual \
+	  && cd $(PACKAGE)/manual \
+	  && $(CVS) up html_node
 	@# According to the rsync manpage, "a trailing slash on the
 	@# source [...] avoids creating an additional directory
 	@# level at the destination".  So the trailing '/' after
 	@# '$(web_manual_dir)' below is intended.
 	$(AM_V_at)$(RSYNC) -avP $(web_manual_dir)/ $t/$(PACKAGE)/manual
+	$(AM_V_at)sed -i '/This page generated by the/i$(MANUAL_VERSION_HTML)' $t/$(PACKAGE)/manual/index.html
+	$(AM_V_at)$(RSYNC) -avP $(web_manual_dir)/ $t/$(PACKAGE)/manual/$(VERSION)
+	$(AM_V_at)sed -i '/This page generated by the/i$(MANUAL_VERSION_HTML_PARENT)' $t/$(PACKAGE)/manual/$(VERSION)/index.html
 	$(AM_V_GEN): \
 	  && cd $t/$(PACKAGE)/manual \
+	  && $(CVS) add $(VERSION) $(VERSION)/*/ \
 	  && new_files=`$(CVSU) --types='?'` \
 	  && new_files=`echo "$$new_files" | sed s/^..//` \
 	  && { test -z "$$new_files" || $(CVS) add -ko $$new_files; } \
-- 
2.34.1

Message #8 received at 53649 <at> debbugs.gnu.org (full text, mbox):

From: Karl Berry <karl <at> freefriends.org>
To: vapier <at> gentoo.org
Cc: 53649 <at> debbugs.gnu.org
Subject: Re: [bug#53649] [PATCH] maint: include versioned manual in update
Date: Mon, 31 Jan 2022 15:38:49 -0700

    Subject: [bug#53649] [PATCH] maint: include versioned manual in update

Seems fine. I think you can go ahead and immediately commit these
patches without a review first. Will see it in the commit email ...
--thanks, karl.

Message #13 received at 53649-done <at> debbugs.gnu.org (full text, mbox):

From: Mike Frysinger <vapier <at> gentoo.org>
To: Karl Berry <karl <at> freefriends.org>
Cc: 53649-done <at> debbugs.gnu.org
Subject: Re: [bug#53649] [PATCH] maint: include versioned manual in update
Date: Mon, 31 Jan 2022 21:52:02 -0500

[Message part 1 (text/plain, inline)]

On 31 Jan 2022 15:38, Karl Berry wrote:
>     Subject: [bug#53649] [PATCH] maint: include versioned manual in update
> 
> Seems fine. I think you can go ahead and immediately commit these
> patches without a review first. Will see it in the commit email ...

i figure we'll find out if it really works when Jim does the next release :)
-mike

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.