Re: svn commit: r51058 - head/share/tools

Glen Barber <[email protected]> Mon, 23 Oct 2017 13:58:15 +0000
Newsgroups	gmane.os.freebsd.devel.cvs.doc
Message-ID	<[email protected]>
On Sun, Oct 22, 2017 at 06:41:44PM +0900, Hiroki Sato wrote:
> Glen Barber <[email protected]> wrote
>   in <[email protected]>:
> 
> gj> Author: gjb
> gj> Date: Thu Oct  5 20:17:33 2017
> gj> New Revision: 51058
> gj> URL: https://svnweb.freebsd.org/changeset/doc/51058
> gj>
> gj> Log:
> gj>   Enable update/checkout of src/share/man/man4 for the 12.0R hardware
> gj>   page.
> gj>
> gj>   Sponsored by:	The FreeBSD Foundation
> gj>
> gj> Modified:
> gj>   head/share/tools/webupdate
> gj>
> gj> Modified: head/share/tools/webupdate
> gj> ==============================================================================
> gj> --- head/share/tools/webupdate	Thu Oct  5 20:13:57 2017	(r51057)
> gj> +++ head/share/tools/webupdate	Thu Oct  5 20:17:33 2017	(r51058)
> gj> @@ -88,7 +88,7 @@ export NO_OBJ=YES
> gj>  # assumes that the directory right below that is the language code.
> gj>  # This works fine if all the languages are in a directory called
> gj>  # 'doc', and not at all if they aren't.
> gj> -subtrees='head
> gj> +subtrees='head src/share/man/man4
> gj>  relnotes11/doc relnotes11/man4
> gj>  relnotes10/doc relnotes10/man4
> gj>  ports';
> gj> @@ -129,6 +129,8 @@ if [ $cond ]; then
> gj>  	svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2;
> gj>
> gj>  	test -d relnotes || mkdir relnotes;
> gj> +	mkdir -p src/share/man/man4
> gj> +	svn co $SVNROOT/base/head/share/man/man4 src/share/man/man4 >> $LOGFILE 2>&1 || exit 2;
> gj>  	svn co $SVNROOT/base/stable/11/release/doc relnotes11/doc >> $LOGFILE 2>&1 || exit 2;
> gj>  	svn co $SVNROOT/base/stable/11/share/man/man4 relnotes11/man4 >> $LOGFILE 2>&1 || exit 2;
> gj>  	svn co $SVNROOT/base/stable/10/release/doc relnotes10/doc >> $LOGFILE 2>&1 || exit 2;
> 
>  I think we need to checkout man4 directory in a per-release-branch
>  (and per-stable-branch for webupdate) basis because each hwnotes
>  should be generated by using man4 directory from a specific release
>  after migration from src/release/doc.  I think relnotes/12/man4, and
>  relnotes/12.0/man4 after releng/12.0 would be reasonable names if we
>  reuse the old convention.
> 

Yes, that is the plan for future updates.

> Glen Barber <[email protected]> wrote
>   in <[email protected]>:
> 
> gj> Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile
> gj> ==============================================================================
> gj> --- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile	Thu Oct  5 20:20:05 2017	(r51059)
> gj> +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile	Thu Oct  5 20:32:26 2017	(r51060)
> gj> @@ -21,6 +21,13 @@ SRCS?=			errata.xml
> gj>
> gj>  DATA+=			${DOC}.html
> gj>
> gj> +beforeclean:
> gj> +CLEANFILES+=		${DOC}.html \
> gj> +			${DOC}.txt \
> gj> +			catalog-cwd.xml \
> gj> +			autogen.ent \
> gj> +			${DOC}.parsed.*
> gj> +
> 
>  catalog-cwd.xml, autogen.ent, and ${DOC}.parsed.* are already
>  included in doc.dockbook.mk.
> 

With how the targets are invoked and the conditional use of SUBDIR
(which was intentional), these did not properly get cleaned with use of
'clean' or 'beforeclean'.  I have not looked into it further since this
change.

Glen
signature.asc (application/pgp-signature, 833 B)