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

Update webupdate and webupdate.wrapper to fix several issues.

Browse source 
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
This commit is contained in:
Glen Barber 2015-06-24 15:41:33 +00:00
parent 4596aec97c
commit de2755b681
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=46863
2 changed files with 5 additions and 5 deletions

7
share/tools/webupdate
View file

@ -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

3
share/tools/webupdate.wrapper
View file

@ -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