Date: Mon, 28 May 2001 11:40:51 -0700 From: bmah@FreeBSD.ORG (Bruce A. Mah) To: Dima Dorfman <dima@unixfreak.org> Cc: bmah@FreeBSD.ORG, current@FreeBSD.ORG Subject: Re: make release failure Message-ID: <200105281840.f4SIepk49809@bmah-freebsd-0.cisco.com> In-Reply-To: <20010528071217.0D1C43E0B@bazooka.unixfreak.org> References: <20010528071217.0D1C43E0B@bazooka.unixfreak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--==_Exmh_-1915469855P
Content-Type: text/plain; charset=us-ascii
If memory serves me right, Dima Dorfman wrote:
> "David O'Brien" <obrien@FreeBSD.ORG> writes:
> > On Sun, May 27, 2001 at 11:32:09PM -0700, Bruce A. Mah wrote:
> > > +.if !defined(NORELNOTES)
> >
> > Do we really need Yet Another Knob? Why isn't NODOC suffient?
>
> FWIW, I think we should lose NORELNOTES; as you say, NODOC is
> sufficient.
You both speak the truth. :-)
The following patch fixes the make release breakage and brings the
behavior formerly controlled by NORELNOTES under NODOC. I'm going to
do a little (more) testing today, followed by a commit and some more
testing. Feedback is as usual appreciated...
Thanks for the help all...
Bruce.
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.618
diff -u -r1.618 Makefile
--- Makefile 2001/05/25 18:01:31 1.618
+++ Makefile 2001/05/28 18:38:35
@@ -69,15 +69,11 @@
# CPU cycles (some of the programs are C++, and things like ghostscript
# belong to the required ports nevertheless).
#
-# Setting this also disables doc.2 (RELNOTESng).
+# Setting this also disables building of release note documentation
+# (RELNOTESng).
#NODOC= YES
#NOPORTS= YES
-# RELNOTESng can be disabled by uncommenting the following variable
-# definition. RELNOTESng depends on having ports enabled for this
-# release build.
-#NORELNOTES= YES
-
# Uncomment and modify this definition if you want the release notes
# and other release documentation in a language other than English.
#RELNOTES_LANG= en_US.ISO_8859-1
@@ -109,7 +105,7 @@
# on the boot floppy. WARNING: Breaks on some Athlon (K7) motherboards.
AUTO_KEYBOARD_DETECT?= 0
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
DIST_DOCS_ARCH_INDEP= readme errata
DIST_DOCS_ARCH_DEP= installation relnotes hardware
.endif
@@ -219,9 +215,7 @@
.endif
.if !defined(NODOC)
-DOCREL= doc.1
-.if !defined(NORELNOTES)
-DOCREL+= doc.2
+DOCREL= doc.1 doc.2
.endif
.endif
@@ -240,11 +234,6 @@
@echo "unset NOPORTS, or set at least DOMINIMALDOCPORTS to YES!"
@exit 1
.endif
-.if !defined(NORELNOTES) && defined(NODOC)
- @echo "Docs are required for building the release notes. Either"
- @echo "set NORELNOTES or unset NODOC!"
- @exit 1
-.endif
.if make(release)
.if exists(${CHROOTDIR})
# The first command will fail on a handful of files that have their schg
@@ -357,9 +346,6 @@
.if defined(NOSRC)
echo "export NOSRC=${NOSRC}" >> ${CHROOTDIR}/mk
.endif
-.if defined(NORELNOTES)
- echo "export NORELNOTES=${NORELNOTES}" >> ${CHROOTDIR}/mk
-.endif
.if defined(RELNOTES_LANG)
echo "export RELNOTES_LANG=${RELNOTES_LANG}" >> ${CHROOTDIR}/mk
.else
@@ -617,7 +603,7 @@
ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
gzip -9c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
gzip -9c ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt > ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT.gz; \
done
@@ -694,8 +680,13 @@
@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
# Do our last minute floppies directory setup in a convenient place.
- @cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT
+.if !defined(NODOC)
+ @cp ${.CURDIR}/doc/${RELNOTES_LANG}/readme/article.txt \
+ ${RD}/floppies/README.TXT
@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
+.else
+ @(cd ${RD}/floppies; md5 *.flp > CHECKSUM.MD5)
+.endif
touch release.9
#
@@ -707,7 +698,7 @@
-@ln -s . ${FD}/${BUILDNAME}
@cd ${RD} && find floppies -print | cpio -dumpl ${FD}
@cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${FD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
@@ -746,7 +737,7 @@
@cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
-.if !defined(NORELNOTES)
+.if !defined(NODOC)
@for i in ${DIST_DOCS_ARCH_INDEP}; do \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.txt ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
cp ${.CURDIR}/doc/${RELNOTES_LANG}/$$i/article.html ${CD_DISC1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
--==_Exmh_-1915469855P
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.5 (FreeBSD)
Comment: Exmh version 2.3.1+ 05/14/2001
iD8DBQE7Epuy2MoxcVugUsMRAi69AJwKL/3WdtQBKd0VywLTKaEHPxG17ACg84jW
VnL1tSCedk8o3SJ8bC9j99E=
=Znoz
-----END PGP SIGNATURE-----
--==_Exmh_-1915469855P--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105281840.f4SIepk49809>