Synchronize the webupdate script with what is used in the FreeBSD
cluster. Approved by: doceng (implicit) Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
3ee8aa890b
commit
8642e83691
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=43134
1 changed files with 23 additions and 12 deletions
|
@ -44,7 +44,7 @@
|
||||||
# Default configuration.
|
# Default configuration.
|
||||||
#
|
#
|
||||||
DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin;
|
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_BUILDDIR=/usr/local/www/build;
|
||||||
#DEFAULT_LOGDIR=/usr/local/www/build/log;
|
#DEFAULT_LOGDIR=/usr/local/www/build/log;
|
||||||
DEFAULT_LOGDIR=/usr/local/www/logs/build;
|
DEFAULT_LOGDIR=/usr/local/www/logs/build;
|
||||||
|
@ -84,7 +84,11 @@ WEBMAILTO=${WEBMAILTO:-${DEFAULT_WEBMAILTO}};
|
||||||
# assumes that the directory right below that is the language code.
|
# assumes that the directory right below that is the language code.
|
||||||
# This works fine if all the languages are in a directory called
|
# This works fine if all the languages are in a directory called
|
||||||
# 'doc', and not at all if they aren't.
|
# '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
|
# 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
|
# $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).
|
# 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="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
|
if [ $cond ]; then
|
||||||
# Remove the old copies.
|
# Remove the old copies.
|
||||||
rm -Rf $subtrees 2>/dev/null;
|
rm -Rf $subtrees 2>/dev/null;
|
||||||
|
@ -121,18 +125,25 @@ if [ $cond ]; then
|
||||||
rm -Rf $subtrees 2>/dev/null;
|
rm -Rf $subtrees 2>/dev/null;
|
||||||
|
|
||||||
# Check out the new copies. This creates all the $subtrees.
|
# 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;
|
test -d relnotes || mkdir relnotes;
|
||||||
cvs -qR checkout -Pd relnotes/doc src/release/doc >> \
|
svn co $SVNROOT/base/head/release/doc relnotes/doc >> $LOGFILE 2>&1 || exit 2;
|
||||||
$LOGFILE 2>&1 || exit 2;
|
svn co $SVNROOT/base/head/share/man/man4 relnotes/man4 >> $LOGFILE 2>&1 || exit 2;
|
||||||
cvs -qR checkout -Pd relnotes/man4 src/share/man/man4 >> \
|
svn co $SVNROOT/base/stable/9/release/doc relnotes9/doc >> $LOGFILE 2>&1 || exit 2;
|
||||||
$LOGFILE 2>&1 || exit 2;
|
svn co $SVNROOT/base/stable/9/share/man/man4 relnotes9/man4 >> $LOGFILE 2>&1 || exit 2;
|
||||||
rm -f $BUILDDIR/fullbuild.flag
|
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
|
else
|
||||||
svn cleanup head >> $LOGFILE 2>&1 || exit 2;
|
for dir in head relnotes/doc relnotes/man4 ports relnotes9/doc relnotes8/doc relnotes8/man4 relnotes8/man4; do
|
||||||
svn update head >> $LOGFILE 2>&1 || exit 2;
|
svn cleanup $dir >> $LOGFILE 2>&1 || exit 2;
|
||||||
cvs -qR update -dP $subtrees >> $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
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue