Date: Mon, 04 Feb 2002 18:47:22 -0500 (EST) From: John Baldwin <jhb@FreeBSD.org> To: Makoto Matsushita <matusita@jp.FreeBSD.org> Cc: ast@marabu.ch, doc@FreeBSD.org Subject: RE: src/release/Makefile: renaming 'DOCDISTFILES' Message-ID: <XFMail.020204184722.jhb@FreeBSD.org> In-Reply-To: <20020131100115W.matusita@jp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 31-Jan-02 Makoto Matsushita wrote:
>
> In src/release/Makefile revision 1.541, 'DOCDISTFILES' variable is
> introduced that points to a directory containing the distfiles to
> build the textproc/docproj during doc.1 target is processed.
>
> However, ports is not used in doc stage in these days -- iso.1 target
> to create ISO image, requires sysutils/mkisofs. It is natual that
> prefetching cdrtools tarball and copy it ${CHROOTDIR}/user/ports/distfiles
> prior to whole release procedure.
>
> Yes, it can be easily done with 'DOCDISTFILES'. But it is *not* doc
> related. If all of you concerning doesn't matter, I want to change
> its variable name to something other appropriate name.
>
> Attached below is a patch to rename this variable. In this patch, I
> employ 'RELEASEDISTFILES' for a new candidate. But I have no idea
> about this new name; if you want to name it, that's OK to me.
>
> Any comments?
Sounds fine to me. :) One thing that might be nice: since we sometimes systems
are unable to fetch their distfiles once they are in the chroot (not sure why,
but I've seen it happen), it might be nice to add a 'fetch-distfiles' target to
the release Makefile that fetches the appropriate distfiles (depending on
NODOC, NOPORTS, etc.) needed to finish the release. Then somse of the nightly
release scripts could do a 'fetch-distfiles' prior to the actual release to
download any missing distfilfes. Just an idea.
> -- -
> Makoto `MAR' Matsushita
>
> Index: Makefile
> ===================================================================
> RCS file: /home/ncvs/src/release/Makefile,v
> retrieving revision 1.655
> diff -u -r1.655 Makefile
> --- Makefile 31 Jan 2002 00:38:09 -0000 1.655
> +++ Makefile 31 Jan 2002 00:58:28 -0000
> @@ -103,8 +103,8 @@
> # by the RELNOTES_LANG variable above.
> ALLLANG?= yes
> DOCPORTS= textproc/docproj
> -# Set this to wherever the distfiles required by ${DOCPORTS} live.
> -DOCDISTFILES?= ${.CURDIR}/../../ports/distfiles
> +# Set this to wherever the distfiles required by release procedures.
> +RELEASEDISTFILES?= ${.CURDIR}/../../ports/distfiles
> # Set this to 1 if you want -P to be used for automatic keyboard detection
> # on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
> AUTO_KEYBOARD_DETECT?= 0
> @@ -298,8 +298,8 @@
> .else
> cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P
> ${RELEASEDOCMODULE}
> .endif
> - if [ -d ${DOCDISTFILES}/ ]; then \
> - cp -rp ${DOCDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
> + if [ -d ${RELEASEDISTFILES}/ ]; then \
> + cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
> fi
> .endif
> .endif
--
John Baldwin <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.020204184722.jhb>