From owner-svn-src-all@FreeBSD.ORG Fri Mar 11 17:01:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F3EE1065673; Fri, 11 Mar 2011 17:01:15 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 33AE48FC08; Fri, 11 Mar 2011 17:01:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2BH1FeN087114; Fri, 11 Mar 2011 17:01:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2BH1Fks087112; Fri, 11 Mar 2011 17:01:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201103111701.p2BH1Fks087112@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 11 Mar 2011 17:01:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219509 - head/release X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2011 17:01:15 -0000 Author: nwhitehorn Date: Fri Mar 11 17:01:14 2011 New Revision: 219509 URL: http://svn.freebsd.org/changeset/base/219509 Log: Add support for generating release documentation. Note that, due to the release documentation build being broken at the moment, this is only partially functional. Modified: head/release/Makefile.bsdinstall Modified: head/release/Makefile.bsdinstall ============================================================================== --- head/release/Makefile.bsdinstall Fri Mar 11 16:58:21 2011 (r219508) +++ head/release/Makefile.bsdinstall Fri Mar 11 17:01:14 2011 (r219509) @@ -13,6 +13,7 @@ # PORTSDIR: location of ports tree to distribute (default: /usr/ports) # NOPORTS: if set, do not distribute ports tree # NOSRC: if set, do not distribute source tree +# NODOC: if set, do not generate release documentation # TARGET/TARGET_ARCH: architecture of built release # @@ -35,6 +36,9 @@ EXTRA_PACKAGES+= ports.txz .if !defined(NOSRC) EXTRA_PACKAGES+= src.txz .endif +.if !defined(NODOC) +EXTRA_PACKAGES+= reldoc +.endif .include @@ -61,6 +65,17 @@ ports.txz: ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz --exclude usr/ports/distfiles --exclude usr/ports/packages --exclude 'usr/ports/INDEX*' --exclude work usr/ports +reldoc: + cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc + -mkdir ${.OBJDIR}/reldoc + @for i in hardware readme relnotes errata; do \ + cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \ + ${.OBJDIR}/reldoc/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/$$i/${TARGET}/article.html \ + ${.OBJDIR}/reldoc/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ + done + @cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/readme/docbook.css ${.OBJDIR}/reldoc + system: packagesystem # Install system -mkdir ${.OBJDIR}/release @@ -69,6 +84,8 @@ system: packagesystem # Copy distfiles mkdir ${.OBJDIR}/release/usr/freebsd-dist cp ${.OBJDIR}/*.txz ${.OBJDIR}/release/usr/freebsd-dist +# Copy documentation, if generated + -cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/release # Set up installation environment ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/release/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.OBJDIR}/release/etc/rc.conf