6346595 tools changes for split tree

4 files changed, 62 insertions, 57 deletions

diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh
index 742f233fe8..ff707a078d 100644
--- a/usr/src/tools/scripts/checkpaths.sh
+++ b/usr/src/tools/scripts/checkpaths.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.
@@ -85,7 +84,7 @@ done
 # marked with ISUSED are always known to be good, thus the Latin quote
 # at the top of the file.
 if [ -r $SRC/tools/findunref/exception_list ]; then
-	validate_paths -k ISUSED -r -e '^\*' -b $SRC \
+	validate_paths -k ISUSED -r -e '^\*' -b $SRC/.. \
 		$SRC/tools/findunref/exception_list
 fi
 
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index 1fd0405e2a..becc878899 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.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.
@@ -238,7 +237,7 @@ clone_source() {
 	cd ${WS}
 
 	echo "creating ${DEST}." >> $LOGFILE
-	find usr/src -name 's\.*' -a -type f -print | \
+	find usr -name 's\.*' -a -type f -print | \
 	    sed -e 's,SCCS\/s.,,' | \
 	    grep -v '/\.del-*' | \
 	    cpio -pd ${DEST} >>$LOGFILE 2>&1
@@ -295,7 +294,7 @@ clone_source() {
 	    tee -a $mail_msg_file >> $LOGFILE
 	cd ${DEST}
 	rm -f ${MAKETARG}.cpio.Z
-	find usr/src -depth -print | \
+	find usr -depth -print | \
 	    grep -v usr/src/${MAKETARG}.out | \
 	    cpio -ocB 2>/dev/null | \
 	    compress > ${CODEMGR_WS}/${MAKETARG}.cpio.Z
@@ -1013,10 +1012,10 @@ if [ "$BRINGOVER_WS" = "" ]; then
 fi
 
 #
-# If BRINGOVER_FILES was not specified, default to usr/src
+# If BRINGOVER_FILES was not specified, default to usr
 #
 if [ "$BRINGOVER_FILES" = "" ]; then
-	BRINGOVER_FILES="usr/src"
+	BRINGOVER_FILES="usr"
 fi
 
 #
@@ -1146,6 +1145,14 @@ PATH="$PATH:$OPTHOME/SUNWspro/bin:$TEAMWARE/bin:/usr/bin:/usr/sbin:/usr/ucb"
 PATH="$PATH:/usr/openwin/bin:/usr/sfw/bin:/opt/sfw/bin:."
 export PATH
 
+# roots of source trees, both relative to $SRC and absolute.
+relsrcdirs="."
+[ -d $SRC/../closed ] && relsrcdirs="$relsrcdirs ../closed"
+abssrcdirs=""
+for d in $relsrcdirs; do
+	abssrcdirs="$abssrcdirs $SRC/$d"
+done
+
 unset CH
 if [ "$o_FLAG" = "y" ]; then
 # root invoked old-style build -- make sure it works as it always has
@@ -1760,12 +1767,14 @@ if [ "$i_FLAG" = "n" -a -d "$SRC" ]; then
 	# Get back to a clean workspace as much as possible to catch
 	# problems that only occur on fresh workspaces.
 	# Remove all .make.state* files, libraries, and .o's that may
-	# have been ommitted from clobber.
+	# have been omitted from clobber.  A couple of libraries are
+	# under SCCS, so leave them alone.
 	# We should probably blow away temporary directories too.
 	cd $SRC
-	find . \( -name SCCS -o -name 'interfaces.*' \) -prune -o \
+	find $relsrcdirs \( -name SCCS -o -name 'interfaces.*' \) -prune -o \
 	    \( -name '.make.*' -o -name 'lib*.a' -o -name 'lib*.so*' -o \
-	       -name '*.o' \) -print | xargs rm -f
+	       -name '*.o' \) -print | \
+	    grep -v 'tools/ctf/dwarf/.*/libdwarf' | xargs rm -f
 else
 	echo "\n==== No clobber at `date` ====\n" >> $LOGFILE
 fi
@@ -1790,16 +1799,6 @@ if [ "$n_FLAG" = "n" ]; then
 		echo "trouble with bringover, quitting at `date`." >> $LOGFILE
 		exit 1
 	fi
-	if [ -d $SRC/cmd/lp/cmd/lpsched/lpsched -a \
-	    ! -f $SRC/cmd/lp/cmd/lpsched/lpsched/Makefile ]; then
-		# on297 printing
-		rm -rf $SRC/cmd/lp/cmd/lpsched/lpsched
-	fi
-	if [ -d $SRC/cmd/localedef/localedef -a \
-	    ! -f $SRC/cmd/localedef/localedef/Makefile ]; then
-		# on297 CSI project
-		rm -rf $SRC/cmd/localedef/localedef
-	fi
 else
 	echo "\n==== No bringover to $CODEMGR_WS ====\n" >> $LOGFILE
 fi
@@ -1841,7 +1840,7 @@ sccs get SCCS >/dev/null 2>&1
 EOF
 	cd $SRC
 	chmod +x ${SCCSHELPER}
-	find . -name SCCS | xargs -L 1 ${SCCSHELPER}
+	find $relsrcdirs -name SCCS | xargs -L 1 ${SCCSHELPER}
 	rm -f ${SCCSHELPER}
 fi
 
@@ -1919,7 +1918,12 @@ if [ "$build_ok" = "y" ]; then
 		# Compare the build's proto list with current package
 		# definitions to audit the quality of package definitions
 		# and makefile install targets. Use the current exception list.
-		PKGDEFS_LIST="-d $SRC/pkgdefs"
+		PKGDEFS_LIST=""
+		for d in $abssrcdirs; do
+			if [ -d $d/pkgdefs ]; then
+				PKGDEFS_LIST="$PKGDEFS_LIST -d $d/pkgdefs"
+			fi
+		done
 
 		$PROTOCMPTERSE \
 		    "Files missing from the proto area:" \
@@ -2168,7 +2172,7 @@ fi
 echo "\n==== Find core files ====\n" | \
     tee -a $LOGFILE >> $mail_msg_file
 
-find $SRC -name core -a -type f -exec file {} \; | \
+find $abssrcdirs -name core -a -type f -exec file {} \; | \
 	tee -a $LOGFILE >> $mail_msg_file
 
 if [ "$f_FLAG" = "y" -a "$build_ok" = "y" ]; then
@@ -2179,8 +2183,11 @@ if [ "$f_FLAG" = "y" -a "$build_ok" = "y" ]; then
 		mv $SRC/unref-${MACH}.out $SRC/unref-${MACH}.ref
 	fi
 
-	findunref $SRC ${TOOLS}/findunref/exception_list \
-	    2>> $mail_msg_file | sort > $SRC/unref-${MACH}.out
+	findunref -t $SRC/.build.tstamp $SRC/.. \
+	    ${TOOLS}/findunref/exception_list \
+	    2>> $mail_msg_file | sort | \
+	    sed -e s=^./src/=./= -e s=^./closed/=../closed/= \
+	    > $SRC/unref-${MACH}.out
 
 	if [ ! -f $SRC/unref-${MACH}.ref ]; then
 		cp $SRC/unref-${MACH}.out $SRC/unref-${MACH}.ref
@@ -2208,7 +2215,7 @@ if [ "$M_FLAG" != "y" -a "$build_ok" = y ]; then
 	# Get pkginfo files from usr/src/pkgdefs
 	#
 	pmodes -qvdP \
-	`for d in $SRC/pkgdefs; do
+	`for d in $SRC/pkgdefs $SRC/../closed/pkgdefs; do
 		if [ -d "$d" ]
 		then
 			find $d -name pkginfo.tmpl -print -o -name .del\* -prune
diff --git a/usr/src/tools/scripts/wx.1 b/usr/src/tools/scripts/wx.1
index bddbd9d9a2..dd13361878 100644
--- a/usr/src/tools/scripts/wx.1
+++ b/usr/src/tools/scripts/wx.1
@@ -1,27 +1,26 @@
 .\" ident	"%Z%%M%	%I%	%E% SMI"
-.\" " 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.
-.\" "
-.\" " You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-.\" " or http://www.opensolaris.org/os/licensing.
-.\" " See the License for the specific language governing permissions
-.\" " and limitations under the License.
-.\" "
-.\" " When distributing Covered Code, include this CDDL HEADER in each
-.\" " file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-.\" " If applicable, add the following below this CDDL HEADER, with the
-.\" " fields enclosed by brackets "[]" replaced with your own identifying
-.\" " information: Portions Copyright [yyyy] [name of copyright owner]
-.\" "
-.\" " CDDL HEADER END
+.\" CDDL HEADER START
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" 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.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" CDDL HEADER END
 .\" "
 .\" "Copyright 2005 Sun Microsystems, Inc.  All rights reserved"
 .\" "Use is subject to license terms."
-.TH wx 1 "1 January 2005"
+.TH wx 1 "27 October 2005"
 .SH NAME
 .I wx
 \- tool to track changes to a workspace, follow ON gate rules and much more
@@ -318,7 +317,7 @@ sorted whenever the active list is updated.  Must follow one of the
 
 src-root-dir: optional path relative to top of workspace where wx will
 search for files. Use "." to set src-root to top of workspace.  Default
-is usr/src.
+is usr.
 
 .TP
 .B jstyle
diff --git a/usr/src/tools/scripts/wx.sh b/usr/src/tools/scripts/wx.sh
index ab4e8f6bd3..b45531af82 100644
--- a/usr/src/tools/scripts/wx.sh
+++ b/usr/src/tools/scripts/wx.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.
@@ -619,7 +618,7 @@ Usage:  $ME command [-D] [args]
                         src-root-dir: optional path relative to top of 
                                       workspace where wx will search for files.
                                       Use "." to set src-root to top of
-                                      workspace.  Default is usr/src.
+                                      workspace.  Default is usr.
         $ME update [-q|-r] [-s]
                         Update the active and renamed file lists by
                         appending names of all files that have been
@@ -1476,7 +1475,8 @@ update_renamed_dir() {
 	typeset -i rc
 
 	if [[ $# -eq 0 ]]; then
-		# No args so we need to create the renamed list from usr/src
+		# No args so we need to create the renamed list from
+		# the source root.
 		append=false
 		if [ -r $wxdir/srcroot_dir ]; then
 			pb_files=$(cat $wxdir/srcroot_dir)
@@ -4480,7 +4480,7 @@ fi
 unset CDPATH	# if set "cd" will print the new directory on stdout
 		# which screws up wx_eval.
 
-DEFAULT_SRCDIR=usr/src
+DEFAULT_SRCDIR=usr
 
 if [[ $# -eq 0 || "$1" == help ]]; then
 	# output usage now to avoid unnecessary checking below.