Date: Thu, 7 Nov 2013 20:49:52 +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: r43134 - head/share/tools Message-ID: <201311072049.rA7Knqx4050381@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Nov 7 20:49:52 2013 New Revision: 43134 URL: http://svnweb.freebsd.org/changeset/doc/43134 Log: Synchronize the webupdate script with what is used in the FreeBSD cluster. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation Modified: head/share/tools/webupdate Modified: head/share/tools/webupdate ============================================================================== --- head/share/tools/webupdate Thu Nov 7 19:57:37 2013 (r43133) +++ head/share/tools/webupdate Thu Nov 7 20:49:52 2013 (r43134) @@ -44,7 +44,7 @@ # Default configuration. # DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin; -DEFAULT_SVNROOT=svn://svn.FreeBSD.org/doc/head +DEFAULT_SVNROOT=svn://svn.FreeBSD.org DEFAULT_BUILDDIR=/usr/local/www/build; #DEFAULT_LOGDIR=/usr/local/www/build/log; DEFAULT_LOGDIR=/usr/local/www/logs/build; @@ -84,7 +84,11 @@ WEBMAILTO=${WEBMAILTO:-${DEFAULT_WEBMAIL # assumes that the directory right below that is the language code. # This works fine if all the languages are in a directory called # 'doc', and not at all if they aren't. -subtrees='head relnotes/doc relnotes/man4'; +subtrees='head +relnotes/doc relnotes/man4 +relnotes9/doc relnotes9/man4 +relnotes8/doc relnotes8/man4 +ports'; # # Update the checked out copies. Check out new copies every Sunday or @@ -113,7 +117,7 @@ echo Build started `date` >> ${LOGFILE} # $subtrees, so I (dd) don't plan on fixing it; there's no sense in # optimizing something that should only happen twice a year (if that). #cond="X`date '+%u'` = X7 `echo $subtrees | sed -E 's/([^ ]*)/-o ! -d \1/g'`"; -cond="-e $BUILDDIR/fullbuild.flag `echo $subtrees | sed -E 's/([^ ]*)/-o ! -d \1/g'`"; +cond="-e $BUILDDIR/fullbuild-clean.flag `echo $subtrees | sed -E 's/([^ ]*)/-o ! -d \1/g'`"; if [ $cond ]; then # Remove the old copies. rm -Rf $subtrees 2>/dev/null; @@ -121,18 +125,25 @@ if [ $cond ]; then rm -Rf $subtrees 2>/dev/null; # Check out the new copies. This creates all the $subtrees. - svn co $SVNROOT head >> $LOGFILE 2>&1 || exit 2; + svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2; test -d relnotes || mkdir relnotes; - cvs -qR checkout -Pd relnotes/doc src/release/doc >> \ - $LOGFILE 2>&1 || exit 2; - cvs -qR checkout -Pd relnotes/man4 src/share/man/man4 >> \ - $LOGFILE 2>&1 || exit 2; - rm -f $BUILDDIR/fullbuild.flag + svn co $SVNROOT/base/head/release/doc relnotes/doc >> $LOGFILE 2>&1 || exit 2; + svn co $SVNROOT/base/head/share/man/man4 relnotes/man4 >> $LOGFILE 2>&1 || exit 2; + svn co $SVNROOT/base/stable/9/release/doc relnotes9/doc >> $LOGFILE 2>&1 || exit 2; + 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 + rm -f $BUILDDIR/fullbuild-clean.flag else - svn cleanup head >> $LOGFILE 2>&1 || exit 2; - svn update head >> $LOGFILE 2>&1 || exit 2; - cvs -qR update -dP $subtrees >> $LOGFILE 2>&1 || exit 2; + for dir in head relnotes/doc relnotes/man4 ports relnotes9/doc relnotes8/doc relnotes8/man4 relnotes8/man4; do + svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; + svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; + done + + #svn update --accept theirs-full relnotes/doc >> $LOGFILE 2>&1 || exit 2; + #svn update --accept theirs-full relnotes/man4 >> $LOGFILE 2>&1 || exit 2; fi #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311072049.rA7Knqx4050381>