os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update the webupdate script to uncomment git calls prior to the

Browse source 
switchover for the repository.

Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-12-04 23:13:25 +00:00
parent 34ff65c7b3
commit 9cc5ea8ef8
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=54730
1 changed files with 12 additions and 12 deletions

24
share/tools/webupdate
View file

@ -47,7 +47,7 @@
# #
DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin; DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin;
DEFAULT_SVNROOT=svn://svn.FreeBSD.org DEFAULT_SVNROOT=svn://svn.FreeBSD.org
#DEFAULT_GITROOT=https://cgit-beta.FreeBSD.org DEFAULT_GITROOT=https://cgit-beta.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;
@ -64,7 +64,7 @@ DEFAULT_WEBMAILTO=freebsd-doc;
# #
PATH=${PATH:-${DEFAULT_PATH}}; export PATH; PATH=${PATH:-${DEFAULT_PATH}}; export PATH;
SVNROOT=${SVNROOT:-${DEFAULT_SVNROOT}}; export SVNROOT; SVNROOT=${SVNROOT:-${DEFAULT_SVNROOT}}; export SVNROOT;
#GITROOT=${GITROOT:-${DEFAULT_GITROOT}}; export GITROOT; GITROOT=${GITROOT:-${DEFAULT_GITROOT}}; export GITROOT;
BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}}; BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}};
LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}}; LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}};
DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR
@ -129,8 +129,8 @@ 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/doc/head head >> $LOGFILE 2>&1 || exit 2; #svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2;
#git clone -b main $GITROOT/doc.git main >> $LOGFILE 2>&1 || exit 2; git clone -b main $GITROOT/doc.git main >> $LOGFILE 2>&1 || exit 2;
test -d relnotes || mkdir relnotes; test -d relnotes || mkdir relnotes;
mkdir -p src/share/man/man4 mkdir -p src/share/man/man4
@ -142,10 +142,10 @@ if [ $cond ]; then
rm -f $BUILDDIR/fullbuild-clean.flag rm -f $BUILDDIR/fullbuild-clean.flag
else else
for dir in ${subtrees}; do for dir in ${subtrees}; do
svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; #svn cleanup $dir >> $LOGFILE 2>&1 || exit 2;
svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; #svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2;
#git -C main clean -f >> $LOGFILE 2>&1 || exit 2; git -C main clean -f >> $LOGFILE 2>&1 || exit 2;
#git -C main pull >> $LOGFILE 2>&1 || exit 2; git -C main pull >> $LOGFILE 2>&1 || exit 2;
done done
fi fi
@ -157,8 +157,8 @@ fi
# #
# Build the web site. # Build the web site.
# #
cd $BUILDDIR/head || exit 1; #cd $BUILDDIR/head || exit 1;
#cd $BUILDDIR/main || exit 1; cd $BUILDDIR/main || exit 1;
# get latest revision # get latest revision
LATESTREVISION=$LOGDIR/LATESTREVISION LATESTREVISION=$LOGDIR/LATESTREVISION
@ -173,8 +173,8 @@ time make ${BUILDARGS} p-all >> $LOGFILE 2>&1 ||
| /usr/sbin/sendmail -oi -f www-data@freebsd.org ${WEBMAILTO}; | /usr/sbin/sendmail -oi -f www-data@freebsd.org ${WEBMAILTO};
exit 3) || exit 3; exit 3) || exit 3;
cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1; #cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1;
#cd $BUILDDIR/main/en_US.ISO8859-1/htdocs || exit 1; cd $BUILDDIR/main/en_US.ISO8859-1/htdocs || exit 1;
( time make ${INSTARGS} -j8 all && time make ${INSTARGS} install ) >> $LOGFILE 2>&1 || ( time make ${INSTARGS} -j8 all && time make ${INSTARGS} install ) >> $LOGFILE 2>&1 ||
(cat $LATESTREVISION >> $LOGFILE (cat $LATESTREVISION >> $LOGFILE