Make separate FTP and CDROM staging areas. The FTP area has compressed

documentation by default, and the CDROM area doesn't (to avoid cluttering
up directories).

Also include a PGP key ring in the build, and tweak texts slightly.
This commit is contained in:
Bruce A. Mah 2002-06-27 15:00:21 +00:00
parent 15e6c7bff1
commit 412dedcf55
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=13494
2 changed files with 49 additions and 13 deletions
release

View file

@ -57,10 +57,17 @@ INSTALL_COMPRESSED?= zip gz
# #
MISCOPTIONS+= NO_JPMAN=yes RLE=yes GEN_INDEX=1 MISCOPTIONS+= NO_JPMAN=yes RLE=yes GEN_INDEX=1
DOCOBJDIR= ${DOCROOTDIR}/obj
DOCBUILDFILE= ${DOCOBJDIR}/build.txt
DOCKEYFILE= ${DOCOBJDIR}/pgpkeyring.txt
DOCSTAGEDIR= ${DOCROOTDIR}/doc DOCSTAGEDIR= ${DOCROOTDIR}/doc
DOCBUILDFILE= ${DOCROOTDIR}/doc/BUILD.TXT DOCFTPSTAGEDIR= ${DOCSTAGEDIR}/ftp
DOCCDROMSTAGEDIR= ${DOCSTAGEDIR}/cdrom
rerelease release: rerelease release: release.1 ftp.1 cdrom.1
@${ECHO} ">>> make ${.TARGET} finished on `LC_ALL=C TZ=GMT date`"
release.1:
.if !defined(DOCROOTDIR) .if !defined(DOCROOTDIR)
@${ECHO} "To make a release you must define DOCROOTDIR" && false @${ECHO} "To make a release you must define DOCROOTDIR" && false
.endif .endif
@ -70,19 +77,20 @@ rerelease release:
.if make(release) .if make(release)
${RM} -rf ${DOCROOTDIR} ${RM} -rf ${DOCROOTDIR}
${MKDIR} ${DOCROOTDIR} ${MKDIR} ${DOCROOTDIR}
${MKDIR} ${DOCROOTDIR}/obj ${MKDIR} ${DOCOBJDIR}/obj
find ${DOC_PREFIX} -type d -a \! -name CVS | sed -e s,^,${DOCROOTDIR}/obj, | xargs ${MKDIR} find ${DOC_PREFIX} -type d -a \! -name CVS | sed -e s,^,${DOCOBJDIR}/obj, | xargs ${MKDIR}
${MKDIR} ${DOCSTAGEDIR} ${MKDIR} ${DOCSTAGEDIR}
.endif .endif
# Build documents in the obj area and install them to our staging area. # Build documents in the obj area.
# We do this so as to avoid interference with any built documents that # We do this so as to avoid interference with any built documents that
# happen to be sitting under ${DOC_PREFIX}, which might be built with # happen to be sitting under ${DOC_PREFIX}, which might be built with
# different options, etc. # different options, etc.
cd ${DOC_PREFIX} && env MAKEOBJDIRPREFIX=${DOCROOTDIR}/obj ${MAKE} all install DOCDIR=${DOCSTAGEDIR} FORMATS="${FORMATS}" INSTALL_COMPRESSED="${INSTALL_COMPRESSED}" ${MISCOPTIONS} cd ${DOC_PREFIX} && \
# Copy any files in our texts/ directory to the staging area. env MAKEOBJDIRPREFIX=${DOCOBJDIR} ${MAKE} all FORMATS="${FORMATS}" INSTALL_COMPRESSED="${INSTALL_COMPRESSED}" ${MISCOPTIONS}
${TAR} --exclude CVS -cf - -C ${.CURDIR}/texts . | \ # Build PGP key ring
${TAR} xf - -C ${DOCSTAGEDIR} ${RM} -f ${DOCKEYFILE}
# Construct the BUILD.TXT file with the documentation build info. cd ${DOC_PREFIX}/en_US.ISO8859-1/books/handbook && env ${MAKE} pgpkeyring > ${DOCKEYFILE}
# Construct the build.txt file with the documentation build info.
${RM} -f ${DOCBUILDFILE} ${RM} -f ${DOCBUILDFILE}
${TOUCH} ${DOCBUILDFILE} ${TOUCH} ${DOCBUILDFILE}
${ECHO} "FreeBSD Documentation ${BUILDNAME}" >> ${DOCBUILDFILE} ${ECHO} "FreeBSD Documentation ${BUILDNAME}" >> ${DOCBUILDFILE}
@ -90,10 +98,33 @@ rerelease release:
${ECHO} "Generated by: ${USER}@`${HOSTNAME}`">> ${DOCBUILDFILE} ${ECHO} "Generated by: ${USER}@`${HOSTNAME}`">> ${DOCBUILDFILE}
${ECHO} "Formats: ${FORMATS}" >> ${DOCBUILDFILE} ${ECHO} "Formats: ${FORMATS}" >> ${DOCBUILDFILE}
${ECHO} "Languages: ${DOC_LANG}" >> ${DOCBUILDFILE} ${ECHO} "Languages: ${DOC_LANG}" >> ${DOCBUILDFILE}
# Make FTP staging area
ftp.1:
${RM} -rf ${DOCFTPSTAGEDIR}
${MKDIR} ${DOCFTPSTAGEDIR}
cd ${DOC_PREFIX} && \
env MAKEOBJDIRPREFIX=${DOCOBJDIR} ${MAKE} all install DOCDIR=${DOCFTPSTAGEDIR} FORMATS="${FORMATS}" INSTALL_COMPRESSED="${INSTALL_COMPRESSED}" ${MISCOPTIONS}
# Copy newly generated files to staging area
${CP} ${DOCBUILDFILE} ${DOCKEYFILE} ${DOCFTPSTAGEDIR}
# Copy any files in our texts/ directory to staging area
${TAR} --exclude CVS -cf - -C ${.CURDIR}/texts . | \
${TAR} xf - -C ${DOCFTPSTAGEDIR}
# Make CDROM staging area, optionally do ISO images too
cdrom.1:
${RM} -rf ${DOCCDROMSTAGEDIR}
${MKDIR} ${DOCCDROMSTAGEDIR}
cd ${DOC_PREFIX} && \
env MAKEOBJDIRPREFIX=${DOCOBJDIR} ${MAKE} all install DOCDIR=${DOCCDROMSTAGEDIR} FORMATS="${FORMATS}" INSTALL_COMPRESSED="" ${MISCOPTIONS}
# Copy newly generated files to staging area
${CP} ${DOCBUILDFILE} ${DOCKEYFILE} ${DOCCDROMSTAGEDIR}
# Copy any files in our texts/ directory to the staging area.
${TAR} --exclude CVS -cf - -C ${.CURDIR}/texts . | \
${TAR} xf - -C ${DOCCDROMSTAGEDIR}
# Make ISO images if desired. # Make ISO images if desired.
.if defined(MAKE_ISOS) .if defined(MAKE_ISOS)
cd ${DOCROOTDIR} && ${MKISOFS} -r -J -V fbsd_doc -o doc.iso ${DOCSTAGEDIR} cd ${DOCROOTDIR} && ${MKISOFS} -r -J -V fbsd_doc -o ${DOCSTAGEDIR}/doc.iso ${DOCCDROMSTAGEDIR}
.endif .endif
@${ECHO} ">>> make ${.TARGET} finished on `LC_ALL=C TZ=GMT date`"
.include "${DOC_PREFIX}/share/mk/doc.project.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk"

View file

@ -48,6 +48,11 @@ rtf Microsoft's Rich Text Format (article.rtf or book.rtf,
into Microsoft Word. Press CTRL+A, CTRL+END, F9, after into Microsoft Word. Press CTRL+A, CTRL+END, F9, after
loading the document, to update the page numbers. loading the document, to update the page numbers.
BUILD.TXT in the top-level directory gives more information about the build.txt in the top-level directory gives more information about the
particular set of languages and formats contained in this release particular set of languages and formats contained in this release
build. build.
pgpkeyring.txt contains the public PGP/GPG keys of FreeBSD committers,
as taken from tne English version of the FreeBSD Handbook. This file
is suitable for import into a keyring.