Redefine the -norestr option to mean 'don't build the list of

restricted ports' instead of 'don't build any restricted ports' since
the former is useful when we're not intending to publish the results
of a build, but the latter is not.

Move the build preprocessing (directory setup, old build rotation,
etc) out from under -nobuild, so that we can set up a new build using
that option.
This commit is contained in:
Kris Kennaway 2004-10-25 04:34:26 +00:00
parent f233e968d9
commit 9acc2f0954
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=120106

View file

@ -271,10 +271,6 @@ fi
# Set up our environment variables # Set up our environment variables
buildenv ${pb} ${arch} ${branch} buildenv ${pb} ${arch} ${branch}
if [ "$norestr" = 1 ]; then
export NO_RESTRICTED=1
fi
if [ "$dodistfiles" = 1 ]; then if [ "$dodistfiles" = 1 ]; then
export WANT_DISTFILES=1 export WANT_DISTFILES=1
fi fi
@ -368,7 +364,9 @@ if [ "$nobuild" = 0 -a "$finish" = 0 ]; then
fi fi
if [ "$skipstart" = 0 ]; then if [ "$skipstart" = 0 ]; then
if [ "$norestr" = 0 ]; then
restrictedlist ${pb} ${arch} ${scripts} ${branch} & restrictedlist ${pb} ${arch} ${scripts} ${branch} &
fi
if [ "$cdrom" = 1 ]; then if [ "$cdrom" = 1 ]; then
cdromlist ${pb} ${arch} ${scripts} ${branch} & cdromlist ${pb} ${arch} ${scripts} ${branch} &
@ -388,7 +386,6 @@ if [ "$skipstart" = 0 ]; then
fi fi
cd ${pb}/${arch} cd ${pb}/${arch}
if [ "$nobuild" = 0 ]; then
mkdir -p ${pb}/${arch}/${branch}/bak mkdir -p ${pb}/${arch}/${branch}/bak
cd ${pb}/${arch}/${branch}/bak cd ${pb}/${arch}/${branch}/bak
rm -rf errors logs packages old-errors rm -rf errors logs packages old-errors
@ -462,8 +459,6 @@ if [ "$skipstart" = 0 ]; then
fi fi
done done
fi fi
fi
fi fi
fi fi