diff options
| author | grant <grant@pkgsrc.org> | 2004-01-30 10:54:36 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-30 10:54:36 +0000 |
| commit | aa090d436699a8764c9d21e076c5786ddb1d8a30 (patch) | |
| tree | df872073b1c75d491e8347f995deeea651573ed6 /mk/bulk | |
| parent | 3b338ae7b621bc4c0ae93ed7d7441820e4536ced (diff) | |
| download | pkgsrc-aa090d436699a8764c9d21e076c5786ddb1d8a30.tar.gz | |
allow the user to set the packages to build in build.conf (PKGLIST).
cache the list in printdepends so that printindex doesn't need to
run the same command(s) again at the start of a bulk build.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/build.conf-example | 5 | ||||
| -rw-r--r-- | mk/bulk/printdepends | 23 | ||||
| -rw-r--r-- | mk/bulk/printindex | 11 |
3 files changed, 28 insertions, 11 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index d3c7781a2cc..5b4bfd82b3d 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -1,9 +1,12 @@ # build.conf -# $NetBSD: build.conf-example,v 1.14 2003/03/09 15:46:00 cjep Exp $ +# $NetBSD: build.conf-example,v 1.15 2004/01/30 10:54:36 grant Exp $ # # config file in /bin/sh syntax for {,pre,post}-build # +# List of package directories to build. +# Defaults to all packages if PKLIST is empty or undefined. +#PKGLIST="www/mozilla meta-pkgs/kde3" # Some paths for output files and paths to log files FTPx=`date +%Y%m%d.%H%M` diff --git a/mk/bulk/printdepends b/mk/bulk/printdepends index 751b3fdb066..d80165ecc8e 100644 --- a/mk/bulk/printdepends +++ b/mk/bulk/printdepends @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: printdepends,v 1.13 2004/01/17 03:39:35 grant Exp $ +# $NetBSD: printdepends,v 1.14 2004/01/30 10:54:36 grant Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -38,6 +38,13 @@ # to contain any failure messages in each package directory. # +# Pull in PKGLIST +if [ -f "$BULK_BUILD_CONF" ]; then + . $BULK_BUILD_CONF +else + . `dirname $0`/build.conf +fi + if [ ! -z "$1" ]; then brokenfile=$1 else @@ -61,11 +68,15 @@ GREP=`${BMAKE} show-var VARNAME=GREP` SED=`${BMAKE} show-var VARNAME=SED` cd $cwd -# List of all pkgs, from pkgsrc/*/Makefile -list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` -#list=`${GREP} '^[^#].*'SUBDIR ma*/Makefile | ${SED} 's,/Makefile.*= *,/,'` -#list=x11/gnome -#list='x11/xteddy x11/xsnow' +if [ -n "${PKGLIST}" ]; then + list="${PKGLIST}" +else + # List of all pkgs, from pkgsrc/*/Makefile + list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` +fi + +# cache the package list for printindex +echo list='"'${list}'"' > .pkglist for pkgdir in $list do diff --git a/mk/bulk/printindex b/mk/bulk/printindex index d0869e11323..d3da6517974 100644 --- a/mk/bulk/printindex +++ b/mk/bulk/printindex @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: printindex,v 1.13 2003/12/10 13:59:06 sketch Exp $ +# $NetBSD: printindex,v 1.14 2004/01/30 10:54:36 grant Exp $ # # # Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -63,9 +63,12 @@ GREP=`${BMAKE} show-var VARNAME=GREP` SED=`${BMAKE} show-var VARNAME=SED` cd $cwd -# List of all pkgs, from pkgsrc/*/Makefile -list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` - +if [ -r ${cwd}/.pkglist ]; then + . ${cwd}/.pkglist +else + # fall back to all packages. + list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` +fi for pkgdir in $list do |