Date: Mon, 23 Oct 2017 13:58:15 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Hiroki Sato <hrs@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: <20171023135815.GD95482@FreeBSD.org> In-Reply-To: <20171022.184144.203971308906863927.hrs@allbsd.org> References: <201710052017.v95KHXIE042251@repo.freebsd.org> <20171022.184144.203971308906863927.hrs@allbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--rqzD5py0kzyFAOWN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 22, 2017 at 06:41:44PM +0900, Hiroki Sato wrote: > Glen Barber <gjb@FreeBSD.org> wrote > in <201710052017.v95KHXIE042251@repo.freebsd.org>: >=20 > 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> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > 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=3DYES > 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=3D'head > gj> +subtrees=3D'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 >> $LOG= FILE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/11/release/doc relnotes11/doc >> $LOGFI= LE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/11/share/man/man4 relnotes11/man4 >> $L= OGFILE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/10/release/doc relnotes10/doc >> $LOGFI= LE 2>&1 || exit 2; >=20 > 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. >=20 Yes, that is the plan for future updates. > Glen Barber <gjb@FreeBSD.org> wrote > in <201710052032.v95KWQbI050265@repo.freebsd.org>: >=20 > gj> Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile > gj> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > gj> --- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oc= t 5 20:20:05 2017 (r51059) > gj> +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oc= t 5 20:32:26 2017 (r51060) > gj> @@ -21,6 +21,13 @@ SRCS?=3D errata.xml > gj> > gj> DATA+=3D ${DOC}.html > gj> > gj> +beforeclean: > gj> +CLEANFILES+=3D ${DOC}.html \ > gj> + ${DOC}.txt \ > gj> + catalog-cwd.xml \ > gj> + autogen.ent \ > gj> + ${DOC}.parsed.* > gj> + >=20 > catalog-cwd.xml, autogen.ent, and ${DOC}.parsed.* are already > included in doc.dockbook.mk. >=20 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 --rqzD5py0kzyFAOWN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEVVuz/A7vpH93hEhKuWzd6q+LXtAFAlnt9XcACgkQuWzd6q+L XtCEfA/9FqGOTRNEHHPYsNuZ9kt2hzd19cWfGPM7X723pOejt9P8oik8d9m3fMT4 1pHbeFDKy/lC8gIP7MsgETdAf2FnvNj9P80fljVu06dHia7kt6GjVKMqpE2uotJZ kZc/8gZh6PLlLcw0SYoGnDrNAhzSID/Eyrs/FBwgNex0P/tCB2V0FTxntO/BxyNO nks7MsvcFr2uNUul+X210JZfUWU0wtZG9KQJVxUlt9GXGyRjqzXP6dJJnFGLLXOP Zvbr/SkcPhPRYqtfY+Wv571omNKVyVvzL7pz9hUJLfWs3MHH/veTuGVGvDuHou3c t0XKs6mVN//06AZQV5ps8SI26QyQd86tZNpWkRcccFQbsOWcoaRYITc49YfpIhMk DzDgjl2nE/LAoQRth987bhUmTF+zwKRv6W81QJUIU53RBXZfCYpKcVFmOelNNpWf nZXqkr6lVUqm1NSWKqyUlY065O/+H5FpCBt68HBb2ET054uPnh5n3LnLI4xP//ZZ zXaxs6o7WK+Hh26Z4Rvke5kjrD5xefp9uF66dyqCdzReQUMwU61gtRG7cX0VJ0O+ nykRojkC2bZRCEjliwu3f5V8iz70TlNMxfJf+KxzmlaMIZesL4l+cC6KjGBQjaVy akTfcYq95dI2AFIcaPeMCKlutV74tgDrzaIosnOXGjj4DjpNeVM= =f50/ -----END PGP SIGNATURE----- --rqzD5py0kzyFAOWN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171023135815.GD95482>