4416654 warning filter list in nightly should be cleaned up

6204054 ParallelMake must die

9 files changed, 66 insertions, 120 deletions

diff --git a/usr/src/tools/README.tools b/usr/src/tools/README.tools
index 149f7e4279..38c2fc9876 100644
--- a/usr/src/tools/README.tools
+++ b/usr/src/tools/README.tools
@@ -32,9 +32,8 @@ package in $(PKGARCHIVE). Installing that package will populate the
 /opt/onbld directory, and create a root account for building called 'gk',
 which uses csh and has a home directory of /opt/onbld/gk. You can
 use this account to do full builds with 'nightly'. You don't have to,
-you just need to be root do a full build, but the 'gk' account has 
-the path setup properly, contains a .make.machines file for pmake,
-and the .login attempts to set up for dmake (if it ever works).
+but the 'gk' account has the path setup properly, has a .make.machines
+file for dmake, and has a .login that sets up for dmake.
 
 Layout of /opt/onbld
 --------------------
@@ -269,7 +268,7 @@ How to do a full build
    edit the file and tailor it to your workspace. Remember that this file
    is a shell script, so it can do more than set environment variables.
 
-2. Login as 'gk' (or root, but your PATH and .make.machines for pmake will
+2. Login as 'gk' (or root, but your PATH and .make.machines for dmake will
    not be right). Run 'nightly' and give it your environment file as an
    option. 'nightly' will first look for your environment file in
    /opt/onbld/env, and if it's not there then it will look for it as an
diff --git a/usr/src/tools/SUNWonbld/postinstall b/usr/src/tools/SUNWonbld/postinstall
index 6e1931e8ef..9b9b267906 100644
--- a/usr/src/tools/SUNWonbld/postinstall
+++ b/usr/src/tools/SUNWonbld/postinstall
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1993-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -56,11 +55,11 @@ if [ "(" -f $BASEDIR/.make.machines ")" -a "!" "(" -f \
 		$BASEDIR/.make.machines.orig;
 fi
 
-# Create a .make.machines file for ParallelMake.  Preserve concurrency setting
+# Create a .make.machines file for dmake.  Preserve concurrency setting
 # for the local machine if present.
 grep `uname -n` $BASEDIR/opt/onbld/gk/.make.machines >/dev/null 2>&1;
 if [ "$?" = "0" ]; then
-	echo "Preserving existing ParallelMake concurrency.";
+	echo "Preserving existing dmake concurrency.";
 	grep `uname -n` $BASEDIR/opt/onbld/gk/.make.machines \
 		> /tmp/.make.machines;
 	mv /tmp/.make.machines $BASEDIR/opt/onbld/gk/.make.machines;
@@ -72,7 +71,7 @@ else
 		max=`expr $max '*' 2`;
 	fi
 	echo "`uname -n` max=$max" > $BASEDIR/opt/onbld/gk/.make.machines;
-	echo "ParallelMake concurrency set to $max.";
+	echo "dmake concurrency set to $max.";
 fi
 
 # Create link for root's .make.machines.
diff --git a/usr/src/tools/env/developer.sh b/usr/src/tools/env/developer.sh
index da957486d1..39ba496b14 100644
--- a/usr/src/tools/env/developer.sh
+++ b/usr/src/tools/env/developer.sh
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +21,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #	Configuration variables for the runtime environment of the nightly
@@ -38,9 +37,8 @@
 #	sends mail on completion (-m and the MAILTO variable)
 #	creates packages for PIT/RE (-p)
 #	checks for changes in ELF runpaths (-r)
-#	use dmake instead of pmake (-d)
 #
-NIGHTLY_OPTIONS="-aCDlmprd";		export NIGHTLY_OPTIONS
+NIGHTLY_OPTIONS="-aCDlmpr";		export NIGHTLY_OPTIONS
 
 # This is a variable for the rest of the script - GATE doesn't matter to
 # nightly itself
diff --git a/usr/src/tools/env/gatekeeper.sh b/usr/src/tools/env/gatekeeper.sh
index a02500ef7c..d279e0f37e 100644
--- a/usr/src/tools/env/gatekeeper.sh
+++ b/usr/src/tools/env/gatekeeper.sh
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,7 +21,7 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #	Configuration variables for the runtime environment of the nightly
@@ -44,9 +43,8 @@
 #	updates the proto area in the parent when done (-U)
 #	checks for changes in ELF runpaths (-r)
 #	checks for changes in unreferenced files (-f)
-#	use dmake instead of pmake (-d)
 #
-NIGHTLY_OPTIONS="-aADClmpuUrfd";		export NIGHTLY_OPTIONS
+NIGHTLY_OPTIONS="-aADClmpuUrf";		export NIGHTLY_OPTIONS
 
 # This is a variable for the rest of the script - GATE doesn't matter to
 # nightly itself
diff --git a/usr/src/tools/env/opensolaris.sh b/usr/src/tools/env/opensolaris.sh
index fda3dda26f..493f3623e2 100644
--- a/usr/src/tools/env/opensolaris.sh
+++ b/usr/src/tools/env/opensolaris.sh
@@ -39,9 +39,8 @@
 #	sends mail on completion (-m and the MAILTO variable)
 #	checks for changes in ELF runpaths (-r)
 #	build and use this workspace's tools in $SRC/tools (-t)
-#	use dmake instead of pmake (-d)
 #
-NIGHTLY_OPTIONS="-FNnaCdDlmrt";		export NIGHTLY_OPTIONS
+NIGHTLY_OPTIONS="-FNnaCDlmrt";		export NIGHTLY_OPTIONS
 
 # This is a variable for the rest of the script - GATE doesn't matter to
 # nightly itself
diff --git a/usr/src/tools/gk/login.sh b/usr/src/tools/gk/login.sh
index 000b2634b4..f623467520 100644
--- a/usr/src/tools/gk/login.sh
+++ b/usr/src/tools/gk/login.sh
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 # 
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -56,7 +55,6 @@ set path=( \
 	/opt/onbld/bin/${MACH} \
 	/opt/SUNWspro/bin \
 	/opt/teamware/bin \
-	/opt/teamware/ParallelMake/bin \
 	/usr/ccs/bin \
 	/usr/proc/bin \
 	/usr/openwin/bin \
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index dfa837d8d2..bc16461d71 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -3,9 +3,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -231,7 +230,7 @@ if [ "$SH_FLAG" = "y" ]; then
 fi
  
 # 	Set PATH for a build
-PATH="/opt/onbld/bin:/opt/onbld/bin/${MACH}:/opt/SUNWspro/bin:/opt/teamware/ParallelMake/bin:/usr/ccs/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/etc:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:."
+PATH="/opt/onbld/bin:/opt/onbld/bin/${MACH}:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/bin:/usr/sbin:/usr/ucb:/usr/etc:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:."
 if [ "${SUNWSPRO}" != "" ]; then 
 	PATH="${SUNWSPRO}/bin:$PATH" 
 	export PATH 
diff --git a/usr/src/tools/scripts/nightly.1 b/usr/src/tools/scripts/nightly.1
index 750aedacce..94c6673e51 100644
--- a/usr/src/tools/scripts/nightly.1
+++ b/usr/src/tools/scripts/nightly.1
@@ -2,9 +2,8 @@
 .\" " CDDL HEADER START
 .\" "
 .\" " The contents of this file are subject to the terms of the
-.\" " Common Development and Distribution License, Version 1.0 only
-.\" " (the "License").  You may not use this file except in compliance
-.\" " with the License.
+.\" " Common Development and Distribution License (the "License").
+.\" " You may not use this file except in compliance with the License.
 .\" "
 .\" " You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 .\" " or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,9 @@
 .\" "
 .\" " CDDL HEADER END
 .\" "
-.\" "Copyright 2005 Sun Microsystems, Inc.  All rights reserved."
+.\" "Copyright 2006 Sun Microsystems, Inc.  All rights reserved."
 .\" "Use is subject to license terms."
-.TH nightly 1 "1 January 2005"
+.TH nightly 1 "23 June 2006"
 .SH NAME
 .I nightly
 \- build an OS-Net consolidation overnight
@@ -210,9 +209,6 @@ Default group of options for building a release (-mp)
 .B \-V VERS
 set the build version string to VERS, overriding VERSION
 .TP
-.B \-d
-use Distributed Make (default uses Parallel Make)
-.TP
 .B \-X
 do IA32 realmode builds (requires access to a
 properly-configured NT build machine and root permissions)
@@ -450,9 +446,9 @@ check, which appears in the nightly output as "Check lists of files."
 .LP
 .B CHECK_DMAKE
 .RS 5
-Nightly validates that, if dmake is in use, the version of dmake
-encountered is known to be safe to use.  Set this flag to 'n' to
-disable this test, allowing any version of dmake to be used.
+Nightly validates that the version of dmake encountered is known to be
+safe to use.  Set this flag to 'n' to disable this test, allowing any
+version of dmake to be used.
 .RE
 .LP
 .SH REALMODE ENVIRONMENT VARIABLES
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 9c01df873d..406a37eae7 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -372,30 +372,10 @@ build() {
 
 	if [ "$W_FLAG" = "n" ]; then
 		echo "\n==== Build warnings ($LABEL) ====\n" >>$mail_msg_file
-		# should be none, but there are a few that are pmake
-		# related, and a couple of silly ones.
 		egrep -i warning: $SRC/${INSTALLOG}.out \
 			| egrep -v '^tic:' \
-			| egrep -v '^mcs:' \
-			| egrep -v '^LD_LIBRARY_PATH=' \
-			| egrep -v 'multiple use of -K option' \
-			| egrep -v 'option -I appears more than once' \
-			| egrep -v 'ar: creating' \
-			| egrep -v 'ar: writing' \
-			| egrep -v 'conflicts:' \
-			| egrep -v ':saved created' \
-			| egrep -v '^stty.*c:' \
-			| egrep -v '^mfgname.c:' \
-			| egrep -v '^uname-i.c:' \
-			| egrep -v '^volumes.c:' \
-			| egrep -v '^lint library construction:' \
-			| egrep -v 'tsort: INFORM:' \
-			| egrep -v 'stripalign:' \
-			| egrep -v 'chars, width' \
-			| egrep -v 'option -zdefs/nodefs appears more than' \
 			| egrep -v "symbol \`timezone' has differing types:" \
-			| egrep -v "parameter <PSTAMP> set to" \
-			| egrep -v "^Manifying" \
+		        | egrep -v "parameter <PSTAMP> set to" \ 
 			| egrep -v "Ignoring unknown host" \
 			| egrep -v "redefining segment flags attribute for" \
 			>> $mail_msg_file
@@ -418,8 +398,6 @@ build() {
 			| egrep -v '^tic:' \
 			| egrep -v '^mcs' \
 			| egrep -v '^LD_LIBRARY_PATH=' \
-			| egrep -v 'multiple use of -K option' \
-			| egrep -v 'option -I appears more than once' \
 			| egrep -v 'ar: creating' \
 			| egrep -v 'ar: writing' \
 			| egrep -v 'conflicts:' \
@@ -432,7 +410,6 @@ build() {
 			| egrep -v 'tsort: INFORM:' \
 			| egrep -v 'stripalign:' \
 			| egrep -v 'chars, width' \
-			| egrep -v 'option -zdefs/nodefs appears more than' \
 			| egrep -v "symbol \`timezone' has differing types:" \
 			| egrep -v 'PSTAMP' \
 			| egrep -v '|%WHOANDWHERE%|' \
@@ -610,10 +587,6 @@ dolint() {
 	if [ -f ${LINTNOISE}.out ]; then
 		mv ${LINTNOISE}.out ${LINTNOISE}.ref
 	fi
-        #grep : $LINTOUT |
-		#egrep -v '^(name|function|value|argument|real|user|sys)' |
-		#egrep -v 'warning: (name|function|value|possibly)' |
-		#egrep -v 'warning: argument used' |
         grep : $LINTOUT | \
 		egrep -v '^(real|user|sys)' |
 		egrep -v '(library construction)' | \
@@ -845,7 +818,6 @@ NIGHTLY_OPTIONS variable in the <env_file> as follows:
 	-V VERS set the build version string to VERS
 	-X	copy x86 IHV proto area
 	-a	create cpio archives
-	-d	use Distributed Make (default uses Parallel Make)
 	-f	find unreferenced files
 	-i	do an incremental build (no "make clobber")
 	-l	do "make lint" in $LINTDIRS (default: $SRC y)
@@ -875,7 +847,6 @@ NIGHTLY_OPTIONS variable in the <env_file> as follows:
 # default values for low-level FLAGS; G I R are group FLAGS
 A_FLAG=n
 a_FLAG=n
-d_FLAG=n
 C_FLAG=n
 F_FLAG=n
 f_FLAG=n
@@ -1062,7 +1033,7 @@ check_closed_tree
 
 #
 # Note: changes to the option letters here should also be applied to the
-#	bldenv script.
+#	bldenv script.  `d' is listed for backward compatibility.
 #
 OPTIND=1
 while getopts ABDFNMPTCGIRafinlmoptuUxdrtzWS:X FLAG $NIGHTLY_OPTIONS
@@ -1099,8 +1070,6 @@ do
 		;;
 	  a )	a_FLAG=y
 		;;
-	  d )	d_FLAG=y
-		;;
 	  f )	f_FLAG=y
 		;;
 	  i )	i_FLAG=y
@@ -1214,34 +1183,33 @@ POUND_SIGN="#"
 # the Makefile.master definitions.
 export o_FLAG POUND_SIGN
 
-if [ "$d_FLAG" = "y" ]; then
-	maketype="distributed"
-	MAKE=dmake
-	# get the dmake version string alone
-	DMAKE_VERSION=$( $MAKE -v )
-	DMAKE_VERSION=${DMAKE_VERSION#*: }
-	# focus in on just the dotted version number alone
-	DMAKE_MAJOR=$( echo $DMAKE_VERSION | \
-		sed -e 's/.*\<\([^.]*\.[^   ]*\).*$/\1/' )
-	# extract the second (or final) integer
-	DMAKE_MINOR=${DMAKE_MAJOR#*.}
-	DMAKE_MINOR=${DMAKE_MINOR%%.*}
-	# extract the first integer
-	DMAKE_MAJOR=${DMAKE_MAJOR%%.*}
-	CHECK_DMAKE=${CHECK_DMAKE:-y}
-	# x86 was built on the 12th, sparc on the 13th.
-	if [ "$CHECK_DMAKE" = "y" -a \
-	     "$DMAKE_VERSION" != "Sun Distributed Make 7.3 2003/03/12" -a \
-	     "$DMAKE_VERSION" != "Sun Distributed Make 7.3 2003/03/13" -a \( \
-	     "$DMAKE_MAJOR" -lt 7 -o \
-	     "$DMAKE_MAJOR" -eq 7 -a "$DMAKE_MINOR" -lt 4 \) ]; then
-		if [ -z "$DMAKE_VERSION" ]; then
-			echo "$MAKE is missing."
-			exit 1
-		fi
-		echo `whence $MAKE`" version is:"
-		echo "  ${DMAKE_VERSION}"
-		cat <<EOF
+maketype="distributed"
+MAKE=dmake
+# get the dmake version string alone
+DMAKE_VERSION=$( $MAKE -v )
+DMAKE_VERSION=${DMAKE_VERSION#*: }
+# focus in on just the dotted version number alone
+DMAKE_MAJOR=$( echo $DMAKE_VERSION | \
+	sed -e 's/.*\<\([^.]*\.[^   ]*\).*$/\1/' )
+# extract the second (or final) integer
+DMAKE_MINOR=${DMAKE_MAJOR#*.}
+DMAKE_MINOR=${DMAKE_MINOR%%.*}
+# extract the first integer
+DMAKE_MAJOR=${DMAKE_MAJOR%%.*}
+CHECK_DMAKE=${CHECK_DMAKE:-y}
+# x86 was built on the 12th, sparc on the 13th.
+if [ "$CHECK_DMAKE" = "y" -a \
+     "$DMAKE_VERSION" != "Sun Distributed Make 7.3 2003/03/12" -a \
+     "$DMAKE_VERSION" != "Sun Distributed Make 7.3 2003/03/13" -a \( \
+     "$DMAKE_MAJOR" -lt 7 -o \
+     "$DMAKE_MAJOR" -eq 7 -a "$DMAKE_MINOR" -lt 4 \) ]; then
+	if [ -z "$DMAKE_VERSION" ]; then
+		echo "$MAKE is missing."
+		exit 1
+	fi
+	echo `whence $MAKE`" version is:"
+	echo "  ${DMAKE_VERSION}"
+	cat <<EOF
 
 This version may not be safe for use.  Either set TEAMWARE to a better
 path or (if you really want to use this version of dmake anyway), add
@@ -1249,12 +1217,7 @@ the following to your environment to disable this check:
 
   CHECK_DMAKE=n
 EOF
-		exit 1
-	fi
-else
-	PATH="$TEAMWARE/ParallelMake/bin:$PATH"
-	maketype="parallel"
-	MAKE=make
+	exit 1
 fi
 export PATH
 export MAKE
@@ -1705,9 +1668,7 @@ echo "%M% version %I% 20%E%\n" | tee -a $mail_msg_file >> $LOGFILE
 
 # make
 whence $MAKE | tee -a $mail_msg_file >> $LOGFILE
-if [ "$d_FLAG" = "y" ]; then
-	$MAKE -v | tee -a $mail_msg_file >> $LOGFILE
-fi
+$MAKE -v | tee -a $mail_msg_file >> $LOGFILE
 echo "number of concurrent jobs = $DMAKE_MAX_JOBS" |
     tee -a $mail_msg_file >> $LOGFILE
 
@@ -1729,12 +1690,11 @@ fi
 	echo
 	# 
 	# Put statefile somewhere we know we can write to rather than trip
-	# over a read-only $srcroot.  Use /usr/ccs/bin/make here because 
-	# it supports -K and ParallelMake doesn't.
+	# over a read-only $srcroot.
 	# 
 	rm -f $TMPDIR/make-state
 	export SRC=$srcroot
-	if /usr/ccs/bin/make -K $TMPDIR/make-state -e $target 2>/dev/null; then
+	if $MAKE -K $TMPDIR/make-state -e $target 2>/dev/null; then
 		continue
 	fi
 	touch $TMPDIR/nocompiler