Commit Graph

44 Commits

Author SHA1 Message Date
mrg 399cc76267 also look in ./usr/X11R7/ for x. 2013-06-10 05:03:20 +00:00
christos 7d21351ce5 make metalog files trully optional (don't print errors when they don't exist) 2013-01-15 02:46:41 +00:00
uebayasi f22a6fb255 Put intermediate lists on the top of ${DESTDIR} (${DESTDIR}/SETS.*) and leave
them.  Teach list generators to ignore them.  Always generate metalog
missing/extra lists too, but don't check it (for now).  I'll change "flist"
to be generated only when set lists have changed.

No functional changes.
2009-12-11 11:48:41 +00:00
uebayasi 76ff00f330 Thinko; missing/extra are generated differently for metalog/destdir comparison
methods.  Fix mistakenly merged generation functions.
2009-12-10 17:18:33 +00:00
uebayasi 36a7418873 Style. Better variable names. 2009-12-10 16:40:21 +00:00
uebayasi 9efd91e8af Share more code. Call functions in one place. 2009-12-10 16:22:06 +00:00
uebayasi 62eb5f0ca2 Refactor; move generate_* function calls in single place. 2009-12-10 16:12:00 +00:00
uebayasi fe0b0f3007 Use more functions. But still no functional changes. 2009-12-10 16:09:13 +00:00
uebayasi c5999c8ae5 Use shell function because I like it. No functional changes. 2009-12-10 16:01:06 +00:00
uebayasi d166c4bf28 Support "extsrc", externally added programs and libraries. Users can write
their own reach-overs, cross-build, install, and get set files just like base
and X11 / X.org.  (These sets are not included as TNF releases.)
2009-11-30 16:13:22 +00:00
apb 9d84a95580 Simplify the way EXCLUDE_REGEXP is built. 2009-04-23 09:30:56 +00:00
dbj ad69f7c05a fixes for building into case preserving, but case insensitive $DESTDIR
- have checkflist do a second possibly case insensitive check for
   files which are missing from DESTDIR
 - have postinstall require exact case matches for obsolete files
2006-09-11 22:16:10 +00:00
apb d6b37f8359 No space in "function()", "command;" or "$(command)".
Requested by christos.
2006-01-28 19:01:23 +00:00
apb b58c0411a8 Disable checking of metalog in checkflist. In future,
this checking should be reinstated, but with proper
handling of obsolete files.

Reviewed by christos
2006-01-06 18:07:56 +00:00
apb 52ec81299e * Add a check for consistency between DESTDIR and METALOG, in addition
to the existing check for consistency between DESTDIR and the output
  from makeflist.
* Use egrep instead of awk to ignore differences that are expected.
  This should be easier to maintain, and should also make it easier
  for users to add their own custom exceptions by editing the
  regexp.

Reviewed by agc
2006-01-04 15:08:42 +00:00
apb 0bee96eab7 Ensure that (almost) all shell variables in distrib/sets/* scripts are
used with curly braces and quotes, as in "${var}".

Also ensure that command substitution is quoted, as in "$(command)", and
convert `command` to $(command).

Reviewed by agc
2006-01-03 18:31:09 +00:00
apb 3a0b541193 Add shell variables defined in sets.subr for almost all commands used
by scripts in distrib/sets/*.  This is intended to be useful when cross
building.  Only trivial commands like echo, cat, and rm are excluded
from this treatment.

While I am here, make ${MTREE} and ${DB} follow the pattern used by most
other such variables.

Reviewed by agc.
2006-01-03 16:40:16 +00:00
apb 26d8593b50 Move default values for several shell variables into sets.subr.
Reviewed by agc
2006-01-03 15:42:42 +00:00
jmc d5bf52b805 Set default vars so blank and unset both end up w. a reasonable default 2005-10-21 02:41:14 +00:00
lukem 3c7f5007f5 show count of missing and extra files. idea from rtr@ 2004-01-08 01:31:57 +00:00
lukem b852db83fb Significant overhaul of how the sets are used:
* Add an optional third field to the sets file which is a list of
  comma separated keywords that control if the line is printed.
  Currently supported keywords
	kerberos4	${MKKERBEROS4} != no
	kerberos	${MKKERBEROS} != no
	lint		${MKLINT} != no
	obsolete	${obsolete} != 0.
			In this case, non obsolete files are not printed.
  (This will allow future support for builds with variables such as
  MKHESIOD and MKYP set to "no".)

* Use sh(1)'s getopts where appropriate, and otherwise cleanup the
  various scripts.

* Move defaults for sets.subr from sets.defaults into sets.subr.
  Move replicated code for determining stuff such as shlibs type
  from various scripts into sets.subr.

* Merge the obsolete.*, krb.*, krb4.* and lint.* into the appropriate
  main lists with the relevant third field keyword(s).
2003-12-29 03:13:25 +00:00
dmcmahill 4134c82db7 add a -print to the find statement to avoid problems on solaris where
each file/directory/link is printed twice.  Fixes PR23270
2003-10-26 14:21:49 +00:00
lukem 38ae235c4f * add -e; extra files are not fatal
* add -m; missing files are not fatal
* use  ${MKTEMP} -d  instead of home-grown tempdir creation code
2003-09-30 06:23:43 +00:00
lukem 253d3ec330 make "extra files" a fatal error again, based on various feedback.
i'll consider adding an optional switch and associated build infrastructure
to enable the "non fatal extra files" functionality instead.
2003-08-13 00:03:00 +00:00
lukem a66b0c9e9a Rework to use comm(1) instead of diff(1),
and separate "missing files in DESTDIR" (which is fatal)
from "extra files in DESTDIR" (which is now non-fatal).
2003-08-12 04:20:08 +00:00
lukem aedc125774 change test to skip metalog to be a case,
to easily allow other entries to skip to be added.
2003-07-10 03:19:15 +00:00
tron 28aac24c1f X11 directories and files in "/etc". 2003-03-01 07:31:35 +00:00
thorpej 9b81f1bdb0 -path is an extension to find(1) that not all systems have, so don't
use it.  Instead, filter out the metalog file using a separate loop
in the pipeline.
2002-09-16 23:04:39 +00:00
lukem edeb8a9da6 improve the description of the key to the output 2002-08-29 04:19:36 +00:00
lukem dc4928f26f checkflist:
- add "-M metalog".  if metalog starts with "${DESTDIR}/", it
	  will be skipped in the flist check, to prevent unnecessary
	  warnings about extraneous ./METALOG
	- if the diff returned a non-zero exit code, print a warning message,
	  and for the default diff output, print a blurb describing the
	  meaning of the output.

Makefile:
	- call checkflist with "-M ${METALOG}" if UNPRIVED
	- run "${MAKE} checkflist" if ${DESTDIR} != ""

 NOTE:	this change will prevent maketars from running if the
	sets lists are out of date.  This is intentional.
	Better to fail than to build tar files with missing files.
2002-07-09 16:08:38 +00:00
wiz 6ab3ff94e1 fix usage output 2000-11-18 05:29:21 +00:00
thorpej e7d6b96938 Merge a bunch of things from crypto-us and crypto-intl into basesrc,
adding support for Heimdal/KTH Kerberos where easy to do so.  Eliminate
bsd.crypto.mk.

There is still a bunch more work to do, but crypto is now more-or-less
fully merged into the base NetBSD distribution.
2000-06-20 06:00:24 +00:00
abs a741a4a72b Allow -u and -c to set diff style (from Todd Whitesel <toddpw@best.com>) 2000-01-06 21:03:34 +00:00
mrg 60ea90bf92 add crypto-intl support in the "cryptint" set. 1999-11-27 13:10:45 +00:00
perry 772c77a727 Add options for including the "domestic" ("secr") sets. 1998-07-22 17:01:43 +00:00
ross c2f5c9d517 Make the -x11 case actually work. Make the tempfile symbolic. 1998-07-04 09:27:18 +00:00
ross a1394485b6 Revert yesterday's change. 1998-06-30 20:25:14 +00:00
ross 047edc1df7 Compensate for the /usr/include/${MACHINE_ARCH} change. 1998-06-30 05:13:31 +00:00
lukem c1ad909d7a * replace '-arch arch' with '-m machine' (as per make(1)'s $MACHINE). e.g, i386
* add '-a arch' - $MACHINE_ARCH. e.g, m68k, powerpc
* replace long -options with short -options (with backward compat)
* ``knf''ify scripts
1998-06-15 14:45:05 +00:00
chopps 37ac6a5ba8 add -both arg for when one puts xsrc and src builds in same DESTDIR 1997-11-09 20:47:29 +00:00
veego 6f2a7e6f08 Add a new option '-x11' for the xsets. 1997-10-28 13:35:23 +00:00
mikel 294f1691ec translate to sh, add RCSID and a comment 1997-02-18 06:58:56 +00:00
cgd 79e827f345 don't assume that . is in path. pr 964 from Greg Hudson <ghudson@mit.edu> 1995-04-15 19:50:46 +00:00
cgd 02c6564e0e distribution sets contents lists 1994-08-29 15:21:02 +00:00