Date: Wed, 24 Jun 2015 15:41:34 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46863 - head/share/tools Message-ID: <201506241541.t5OFfYTC016166@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Jun 24 15:41:33 2015 New Revision: 46863 URL: https://svnweb.freebsd.org/changeset/doc/46863 Log: Update webupdate and webupdate.wrapper to fix several issues. In webupdate: - Output the ports tree checkout to the log file. - Set the depth of ports/Mk/ to 'infinity', since its contents are needed for 'fetchindex' to work properly. - Reduce redundant explicit paths to use the value of 'subdirs'. In webupdate.wrapper: - Set PORTSDIR to the actual path that is being updated by webupdate. - If PINDEX_OVERRIDE is set, remove the INDEX-INDEXNUM file. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Modified: head/share/tools/webupdate head/share/tools/webupdate.wrapper Modified: head/share/tools/webupdate ============================================================================== --- head/share/tools/webupdate Wed Jun 24 06:27:03 2015 (r46862) +++ head/share/tools/webupdate Wed Jun 24 15:41:33 2015 (r46863) @@ -138,12 +138,11 @@ if [ $cond ]; then svn co $SVNROOT/base/stable/9/share/man/man4 relnotes9/man4 >> $LOGFILE 2>&1 || exit 2; svn co $SVNROOT/base/stable/8/release/doc relnotes8/doc >> $LOGFILE 2>&1 || exit 2; svn co $SVNROOT/base/stable/8/share/man/man4 relnotes8/man4 >> $LOGFILE 2>&1 || exit 2; - svn co --depth immediates $SVNROOT/ports/head ports + svn co --depth immediates $SVNROOT/ports/head ports >> $LOGFILE 2>&1 || exit 2 + svn up --set-depth infinity ports/Mk >> $LOGFILE 2>&1 || exit 2 rm -f $BUILDDIR/fullbuild-clean.flag else - for dir in head relnotes/doc relnotes/man4 ports relnotes10/doc \ - relnotes10/man4 relnotes9/doc relnotes9/man4 relnotes8/doc \ - relnotes8/man4; do + for dir in ${subtrees}; do svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; done Modified: head/share/tools/webupdate.wrapper ============================================================================== --- head/share/tools/webupdate.wrapper Wed Jun 24 06:27:03 2015 (r46862) +++ head/share/tools/webupdate.wrapper Wed Jun 24 15:41:33 2015 (r46863) @@ -15,7 +15,7 @@ RSYNC_FLAGS="-avH" GEN_INDEX=yes WEBMAILTO=freebsd-doc@FreeBSD.org FLAGDIR=/usr/local/www/build -: ${PORTSDIR:=/usr/local/www/ports}; export PORTSDIR +: ${PORTSDIR:=/usr/local/www/build/ports}; export PORTSDIR : ${INDEXNUM:=$(make -C ${PORTSDIR} -V OSREL)} : ${PINDEX_OVERRIDE:=${PORTSDIR}/INDEX-${INDEXNUM%%.*}} export USER=www-data @@ -25,6 +25,7 @@ export WITH_PORTS_GROWTH=YES export WITH_PRSTATS=YES if [ ! -e "${PINDEX_OVERRIDE}" ]; then + [ -e ${PORTSDIR}/INDEX-${INDEXNUM} ] && rm -f ${PORTSDIR}/INDEX-${INDEXNUM} make -C ${PORTSDIR} fetchindex fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506241541.t5OFfYTC016166>