Date: Sun, 22 Oct 2017 18:41:44 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: gjb@FreeBSD.org Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51058 - head/share/tools Message-ID: <20171022.184144.203971308906863927.hrs@allbsd.org> In-Reply-To: <201710052017.v95KHXIE042251@repo.freebsd.org> <201710052032.v95KWQbI050265@repo.freebsd.org> References: <201710052017.v95KHXIE042251@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber <gjb@FreeBSD.org> wrote in <201710052017.v95KHXIE042251@repo.freebsd.org>: 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. Glen Barber <gjb@FreeBSD.org> wrote in <201710052032.v95KWQbI050265@repo.freebsd.org>: 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. -- Hiroki ----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iEYEABECAAYFAlnsZ9gACgkQTyzT2CeTzy2GdgCbBHlRWGhoLpHB8/Fcr7Z5egRJ /dYAniHWTfrGFsPbg2MaxDNTlFkm8dC9 =6Lu/ -----END PGP SIGNATURE----- ----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171022.184144.203971308906863927.hrs>