diff options
Diffstat (limited to 'share/tools/webupdate')
| -rw-r--r-- | share/tools/webupdate | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/share/tools/webupdate b/share/tools/webupdate index 38ef7ee751..d85381c68f 100644 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -45,6 +45,7 @@ # DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin; DEFAULT_CVSROOT=/home/ncvs; +DEFAULT_SVNROOT=svn://svn.FreeBSD.org/doc/head DEFAULT_BUILDDIR=/usr/local/www/build; DEFAULT_LOGDIR=/usr/local/www/build/log; DEFAULT_DESTDIR=/usr/local/www; @@ -58,6 +59,7 @@ DEFAULT_WEBMAILTO=freebsd-doc; # PATH=${PATH:-${DEFAULT_PATH}}; export PATH; CVSROOT=${CVSROOT:-${DEFAULT_CVSROOT}}; export CVSROOT; +SVNROOT=${SVNROOT:-${DEFAULT_SVNROOT}}; export SVNROOT; BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}}; LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}}; DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR @@ -81,7 +83,7 @@ WEBMAILTO=${WEBMAILTO:-${DEFAULT_WEBMAILTO}}; # 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='www doc relnotes/doc relnotes/man4 relnotes6/doc relnotes6/man4 relnotes7/doc relnotes7/man4'; +subtrees='head relnotes/doc relnotes/man4'; # # Update the checked out copies. Check out new copies every Sunday or @@ -113,34 +115,22 @@ if [ $cond ]; then rm -Rf $subtrees 2>/dev/null; # Check out the new copies. This creates all the $subtrees. - cvs -qR checkout -P www >> $LOGFILE 2>&1 || exit 2; - cvs -qR checkout -P doc >> $LOGFILE 2>&1 || exit 2; + svn co $SVNROOT . >> $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; - - test -d relnotes7 || mkdir relnotes7; - cvs -qR checkout -Pd relnotes7/doc -rRELENG_7 src/release/doc >> \ - $LOGFILE 2>&1 || exit 2; - cvs -qR checkout -Pd relnotes7/man4 -rRELENG_7 src/share/man/man4 >> \ - $LOGFILE 2>&1 || exit 2; - - test -d relnotes6 || mkdir relnotes6; - cvs -qR checkout -Pd relnotes6/doc -rRELENG_6 src/release/doc >> \ - $LOGFILE 2>&1 || exit 2; - cvs -qR checkout -Pd relnotes6/man4 -rRELENG_6 src/share/man/man4 >> \ - $LOGFILE 2>&1 || exit 2; else + svn update head >> $LOGFILE 2>&1 || exit 2; cvs -qR update -dP $subtrees >> $LOGFILE 2>&1 || exit 2; fi # # Build the web site. # -cd $BUILDDIR/www/en || exit 1; +cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1; time make ${BUILDARGS} all >> $LOGFILE 2>&1 && time make ${INSTARGS} install >> $LOGFILE 2>&1 || |