Mercurial > illumos > illumos-gate
changeset 900:7a6a7342ba44
6346595 tools changes for split tree
author | kupfer |
---|---|
date | Sun, 13 Nov 2005 16:47:18 -0800 |
parents | 2d007157e61d |
children | 51e564a5263e |
files | usr/src/tools/findunref/exception_list usr/src/tools/scripts/checkpaths.sh usr/src/tools/scripts/nightly.sh usr/src/tools/scripts/wx.1 usr/src/tools/scripts/wx.sh |
diffstat | 5 files changed, 149 insertions(+), 145 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/tools/findunref/exception_list Sun Nov 13 14:20:22 2005 -0800 +++ b/usr/src/tools/findunref/exception_list Sun Nov 13 16:47:18 2005 -0800 @@ -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. @@ -33,7 +32,7 @@ # # Ignore text files. # -./OPENSOLARIS.LICENSE +./src/OPENSOLARIS.LICENSE *.txt */*[Rr][Ee][Aa][Dd][Mm][Ee]* */ChangeLog @@ -46,29 +45,29 @@ # Ignore oddly-named text files scattered about -- someday these should be # suffixed with .txt so we don't have to list them. # -./cmd/oawk/EXPLAIN -./cmd/rpcsvc/nis/rpc.nisd/resolv_server/DNS_FWD -./cmd/vi/port/ex.news -./uts/common/io/dktp/controller/ata/capacity.notes -./cmd/ssh/doc/* +./src/cmd/oawk/EXPLAIN +./src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/DNS_FWD +./src/cmd/vi/port/ex.news +./src/uts/common/io/dktp/controller/ata/capacity.notes +./src/cmd/ssh/doc/* # # Ignore everything under trees that may be resynched from outside ON. # -./cmd/perl -./cmd/svc/configd/sqlite -./cmd/tcpd -./common/openssl -./grub -./uts/intel/sys/acpi +./src/cmd/perl +./src/cmd/svc/configd/sqlite +./src/cmd/tcpd +./src/common/openssl +./src/grub +./src/uts/intel/sys/acpi # # Ignore any files built as part of the nightly program itself. # # ISUSED - let checkpaths know that the next entry is good. -./*.out +./src/*.out # ISUSED - let checkpaths know that the next entry is good. -./*.ref +./src/*.ref # # Ignore warlock-related goop; not used during a nightly. @@ -77,7 +76,7 @@ *.wlcmd */wlcmd */warlock -./uts/sparc/amsrc*/main.c +./src/uts/sparc/amsrc*/main.c # # Ignore ITU's; not used during a nightly. @@ -97,136 +96,136 @@ */test *Test.java *_test.[ch] -./cmd/ldap/common/*test.c -./cmd/logadm/tester -./cmd/print/printmgr/com/sun/admin/pm/client/helptools/extract -./cmd/print/printmgr/com/sun/admin/pm/server/pmtest -./cmd/sendmail/libsm/t-*.c -./cmd/sort/common/convert.c -./cmd/sort/common/invoke.c -./lib/efcode/fcode_test -./lib/libkvm/common/test.c +./src/cmd/ldap/common/*test.c +./src/cmd/logadm/tester +./src/cmd/print/printmgr/com/sun/admin/pm/client/helptools/extract +./src/cmd/print/printmgr/com/sun/admin/pm/server/pmtest +./src/cmd/sendmail/libsm/t-*.c +./src/cmd/sort/common/convert.c +./src/cmd/sort/common/invoke.c +./src/lib/efcode/fcode_test +./src/lib/libkvm/common/test.c # # Ignore debugging code. # -./cmd/fs.d/pcfs/fsck/inject.c -./cmd/sort/common/statistics.c +./src/cmd/fs.d/pcfs/fsck/inject.c +./src/cmd/sort/common/statistics.c # # Ignore internal packages, scripts, and tools that are intentionally not # built or used during a nightly. # -./cmd/mdb/packages -./cmd/sgs/packages -./cmd/sgs/rtld.4.x -./cmd/zic/makefile.tzpkg -./cmd/zic/tzpkg.awk -./prototypes +./src/cmd/mdb/packages +./src/cmd/sgs/packages +./src/cmd/sgs/rtld.4.x +./src/cmd/zic/makefile.tzpkg +./src/cmd/zic/tzpkg.awk +./src/prototypes */tools -./cmd/pools/poold/com/sun/solaris/*/*/package.html +./src/cmd/pools/poold/com/sun/solaris/*/*/package.html # # Ignore files that are only used by internal packages. # -./cmd/sgs/*/*/*chk.msg +./src/cmd/sgs/*/*/*chk.msg # # Ignore files that get used during a EXPORT_SRC or CRYPT_SRC build only. # -./common/crypto/aes/Makefile -./common/crypto/arcfour/Makefile -./common/crypto/blowfish/Makefile -./common/crypto/des/Makefile -./common/crypto/rsa/Makefile -./lib/gss_mechs/mech_dh/backend/mapfile-vers -./lib/gss_mechs/mech_dh/dh1024/mapfile-vers -./lib/gss_mechs/mech_dh/dh192/mapfile-vers -./lib/gss_mechs/mech_dh/dh640/mapfile-vers -./lib/gss_mechs/mech_krb5/spec/krb5_clean.spec -./lib/gss_mechs/mech_spnego/spec/clean.spec -./lib/pkcs11/pkcs11_softtoken/common/Makefile -./uts/common/Makefile -./uts/common/crypto/io/Makefile -./uts/common/gssapi/include/Makefile -./uts/common/gssapi/mechs/dummy/Makefile -./uts/common/gssapi/mechs/krb5/Makefile -./uts/sun4v/io/ncp/Makefile -./xmod +./src/common/crypto/aes/Makefile +./src/common/crypto/arcfour/Makefile +./src/common/crypto/blowfish/Makefile +./src/common/crypto/des/Makefile +./src/common/crypto/rsa/Makefile +./src/lib/gss_mechs/mech_dh/backend/mapfile-vers +./src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers +./src/lib/gss_mechs/mech_dh/dh192/mapfile-vers +./src/lib/gss_mechs/mech_dh/dh640/mapfile-vers +./src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec +./src/lib/gss_mechs/mech_spnego/spec/clean.spec +./src/lib/pkcs11/pkcs11_softtoken/common/Makefile +./src/uts/common/Makefile +./src/uts/common/crypto/io/Makefile +./src/uts/common/gssapi/include/Makefile +./src/uts/common/gssapi/mechs/dummy/Makefile +./src/uts/common/gssapi/mechs/krb5/Makefile +./src/uts/sun4v/io/ncp/Makefile +./src/xmod # # Ignore Makefiles which are used by developers but not used by nightly # itself. This is a questionable practice, since they tend to rot. # -./cmd/syslogd/sparcv9/Makefile -./uts/sparc/uhci/Makefile +./src/cmd/syslogd/sparcv9/Makefile +./src/uts/sparc/uhci/Makefile # # Ignore files only used by lint. Eventually, linting in these areas should # be tied into nightly, at which point these exceptions should be removed. # -./cmd/sgs/*/*/lintsup.c -./cmd/sgs/lib*/common/llib-* -./cmd/sgs/sgsdemangler/common/llib-ldemangle +./src/cmd/sgs/*/*/lintsup.c +./src/cmd/sgs/lib*/common/llib-* +./src/cmd/sgs/sgsdemangler/common/llib-ldemangle # # Ignore sample source code. # -./lib/libdhcpsvc/modules/templates +./src/lib/libdhcpsvc/modules/templates # # Ignore .xcl files that aren't used because the program is statically linked. # -./cmd/cmd-inet/sbin/dhcpagent/dhcpagent.xcl +./src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.xcl # # Ignore sendmail files included for completeness' sake, but which won't # be used until certain _FFR (for future release) #define's go live. # -./cmd/sendmail/include/libmilter/milter.h -./cmd/sendmail/src/statusd_shm.h +./src/cmd/sendmail/include/libmilter/milter.h +./src/cmd/sendmail/src/statusd_shm.h # # Ignore libbsm files which won't be used until later. # -./lib/libbsm/common/adt_ucred.h +./src/lib/libbsm/common/adt_ucred.h # # Ignore libdiskmgt.h. Used for building but not delivered. # -./lib/libdiskmgt/common/libdiskmgt.h +./src/lib/libdiskmgt/common/libdiskmgt.h # # Ignore files originally supplied by ISC (Internet Software Consortium) # as part of a BIND release. # -./lib/libresolv2/common/cylink/bn68000.c -./lib/libresolv2/common/cylink/bn8086.c -./lib/libresolv2/common/cylink/lbn68000.c -./lib/libresolv2/common/cylink/lbn68000.h -./lib/libresolv2/common/cylink/lbn68020.c -./lib/libresolv2/common/cylink/lbn68020.h -./lib/libresolv2/common/cylink/lbn80386.h -./lib/libresolv2/common/cylink/lbn8086.h -./lib/libresolv2/common/cylink/lbnppc.c -./lib/libresolv2/common/cylink/lbnppc.h -./lib/libresolv2/common/cylink/ppcasm.h -./lib/libresolv2/common/cylink/sizetest.c -./lib/libresolv2/common/irs/getaddrinfo.c -./lib/libresolv2/common/irs/nis_p.h -./lib/libresolv2/common/resolv/res_mkupdate.h -./lib/libresolv2/include/err.h -./lib/libresolv2/common/inet/inet_addr.c +./src/lib/libresolv2/common/cylink/bn68000.c +./src/lib/libresolv2/common/cylink/bn8086.c +./src/lib/libresolv2/common/cylink/lbn68000.c +./src/lib/libresolv2/common/cylink/lbn68000.h +./src/lib/libresolv2/common/cylink/lbn68020.c +./src/lib/libresolv2/common/cylink/lbn68020.h +./src/lib/libresolv2/common/cylink/lbn80386.h +./src/lib/libresolv2/common/cylink/lbn8086.h +./src/lib/libresolv2/common/cylink/lbnppc.c +./src/lib/libresolv2/common/cylink/lbnppc.h +./src/lib/libresolv2/common/cylink/ppcasm.h +./src/lib/libresolv2/common/cylink/sizetest.c +./src/lib/libresolv2/common/irs/getaddrinfo.c +./src/lib/libresolv2/common/irs/nis_p.h +./src/lib/libresolv2/common/resolv/res_mkupdate.h +./src/lib/libresolv2/include/err.h +./src/lib/libresolv2/common/inet/inet_addr.c # # Ignore ufs unix version of the boot block, useful for testing. # -./psm/stand/bootblks/ufs/common/iob.h -./psm/stand/bootblks/ufs/common/ufs.c -./psm/stand/bootblks/obp-c/common/cbootblk.h +./src/psm/stand/bootblks/ufs/common/iob.h +./src/psm/stand/bootblks/ufs/common/ufs.c +./src/psm/stand/bootblks/obp-c/common/cbootblk.h # # Ignore mont_mulf.c. It is used as a starting point for some hand optimized # assembly files. We keep it around for future reference. # -./common/bignum/mont_mulf.c +./src/common/bignum/mont_mulf.c
--- a/usr/src/tools/scripts/checkpaths.sh Sun Nov 13 14:20:22 2005 -0800 +++ b/usr/src/tools/scripts/checkpaths.sh Sun Nov 13 16:47:18 2005 -0800 @@ -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 @@ # 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
--- a/usr/src/tools/scripts/nightly.sh Sun Nov 13 14:20:22 2005 -0800 +++ b/usr/src/tools/scripts/nightly.sh Sun Nov 13 16:47:18 2005 -0800 @@ -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 @@ 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 @@ 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 @@ 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:/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 @@ # 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 @@ 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 @@ 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 @@ # 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 @@ 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 @@ 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 @@ # 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
--- a/usr/src/tools/scripts/wx.1 Sun Nov 13 14:20:22 2005 -0800 +++ b/usr/src/tools/scripts/wx.1 Sun Nov 13 16:47:18 2005 -0800 @@ -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 @@ 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
--- a/usr/src/tools/scripts/wx.sh Sun Nov 13 14:20:22 2005 -0800 +++ b/usr/src/tools/scripts/wx.sh Sun Nov 13 16:47:18 2005 -0800 @@ -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 @@ 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 @@ 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 @@ 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.