Numerous changes to eliminate the need for wclean. It is replaced by doing

'wbuild clean'.  tetclean.cfg will soon get the axe as well.

5 files changed, 29 insertions, 163 deletions

diff --git a/xts5/Makefile b/xts5/Makefile
index 375450e9..57aa9e6e 100644
--- a/xts5/Makefile
+++ b/xts5/Makefile
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# $Header: /cvs/xtest/xtest/xts5/Makefile,v 1.5 2005-11-01 01:23:34 jamey Exp $
+# $Header: /cvs/xtest/xtest/xts5/Makefile,v 1.6 2005-11-01 01:38:05 idr Exp $
 #
 # Copyright (c) Applied Testing and Technology, Inc. 1995
 # All Rights Reserved.
@@ -33,7 +33,11 @@
 #
 # Modifications:
 # $Log: Makefile,v $
-# Revision 1.5  2005-11-01 01:23:34  jamey
+# Revision 1.6  2005-11-01 01:38:05  idr
+# Numerous changes to eliminate the need for wclean.  It is replaced by doing
+# 'wbuild clean'.  tetclean.cfg will soon get the axe as well.
+#
+# Revision 1.5  2005/11/01 01:23:34  jamey
 # Add a target for compiling the tests, and include it in make all.
 #
 # Revision 1.4  2005/11/01 00:41:26  jamey
@@ -194,17 +198,17 @@ athena:
 	@(cd $(TET_ROOT)/vsw5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
 
 clean:
-	@(cd src/lib; wclean)
-	@(cd src/libXR5; wclean)
+	@(cd src/lib; wbuild clean)
+	@(cd src/libXR5; wbuild clean)
 	@if [ -d $(TET_ROOT)/vsw5/src/libXtTest ]; \
 	then \
-	cd src/libXtTest; wclean; \
+	cd src/libXtTest; wbuild clean; \
 	fi
-	@(cd src/libproto; wclean)
-	@(cd src/libXtaw; wclean)
-	@(cd src/libXtmu; wclean)
-	@(cd src/xim; wclean)
-	@(cd fonts; wclean)
-	@(cd src/bin/mc ; wclean)
-	@(cd src/bin/reports ; wclean)
-	@(cd src/pixval/blowup; wclean)
+	@(cd src/libproto; wbuild clean)
+	@(cd src/libXtaw; wbuild clean)
+	@(cd src/libXtmu; wbuild clean)
+	@(cd src/xim; wbuild clean)
+	@(cd fonts; wbuild clean)
+	@(cd src/bin/mc ; wbuild clean)
+	@(cd src/bin/reports ; wbuild clean)
+	@(cd src/pixval/blowup; wbuild clean)
diff --git a/xts5/bin/wbuild b/xts5/bin/wbuild
index c92b5ff7..585a702c 100644
--- a/xts5/bin/wbuild
+++ b/xts5/bin/wbuild
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 #!/bin/sh
-# $Header: /cvs/xtest/xtest/xts5/bin/wbuild,v 1.2 2005-11-01 00:48:39 idr Exp $
+# $Header: /cvs/xtest/xtest/xts5/bin/wbuild,v 1.3 2005-11-01 01:38:05 idr Exp $
 #
 # Copyright (c) Applied Testing and Technology, Inc. 1993, 1994
 # All Rights Reserved.
@@ -71,4 +71,5 @@ BCONFIG=${TET_BUILDCONFIG-${TET_ROOT}/vsw5/tetbuild.cfg}
 
 cat $BCONFIG Makefile > $TMP
 
-make -sf $TMP "$@"
+make -f $TMP "$@"
+EXIT_STATUS=$?
diff --git a/xts5/bin/wclean b/xts5/bin/wclean
deleted file mode 100644
index 33c70913..00000000
--- a/xts5/bin/wclean
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2005 X.Org Foundation LLC
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#!/bin/sh
-# $Header: /cvs/xtest/xtest/xts5/bin/Attic/wclean,v 1.1 2005-02-12 14:37:13 anderson Exp $
-#
-# Copyright (c) Applied Testing and Technology, Inc. 1993, 1994
-# All Rights Reserved.
-#
-# Project: VSW5
-#
-# File: vsw5/bin/wclean
-#
-# Description:
-#	VSW5 clean tool
-#
-# Modifications:
-# $Log: wclean,v $
-# Revision 1.1  2005-02-12 14:37:13  anderson
-# Initial revision
-#
-# Revision 8.0  1998/12/23 23:22:43  mar
-# Branch point for Release 5.0.2
-#
-# Revision 7.0  1998/10/30 22:40:42  mar
-# Branch point for Release 5.0.2b1
-#
-# Revision 6.0  1998/03/02 05:15:18  tbr
-# Branch point for Release 5.0.1
-#
-# Revision 5.0  1998/01/26 03:11:51  tbr
-# Branch point for Release 5.0.1b1
-#
-# Revision 4.0  1995/12/15 08:37:33  tbr
-# Branch point for Release 5.0.0
-#
-# Revision 3.1  1995/12/15  00:33:23  andy
-# Prepare for GA Release
-#
-
-# Portions of this software are based on Xlib and X Protocol Test Suite.
-# We have used this material under the terms of its copyright, which grants
-# free use, subject to the conditions below.  Note however that those
-# portions of this software that are based on the original Test Suite have
-# been significantly revised and that all such revisions are copyright (c)
-# 1995 Applied Testing and Technology, Inc.  Insomuch as the proprietary
-# revisions cannot be separated from the freely copyable material, the net
-# result is that use of this software is governed by the ApTest copyright.
-# 
-#  Copyright 1990, 1991 by the Massachusetts Institute of Technology and
-#  UniSoft Group Limited.
-#  
-#  Permission to use, copy, modify, distribute, and sell this software and
-#  its documentation for any purpose is hereby granted without fee,
-#  provided that the above copyright notice appear in all copies and that
-#  both that copyright notice and this permission notice appear in
-#  supporting documentation, and that the names of MIT and UniSoft not be
-#  used in advertising or publicity pertaining to distribution of the
-#  software without specific, written prior permission.  MIT and UniSoft
-#  make no representations about the suitability of this software for any
-#  purpose.  It is provided "as is" without express or implied warranty.
-# 
-
-
-# If there is no Makefile then make it first
-if [ ! -f Makefile ]; then
-	mmkf -o Makefile *.m
-	if [ ! -f Makefile ]; then
-		echo Could not make Makefile
-		exit 1
-	fi
-fi
-
-TMP=/tmp/xm$$
-trap 'rm -f $TMP; exit ${EXIT_STATUS}' 0 1 2 3 15
-
-CCONFIG=${TET_CLEANCONFIG-${TET_ROOT}/vsw5/tetclean.cfg}
-
-cat $CCONFIG Makefile > $TMP
-
-make -sf $TMP clean
-EXIT_STATUS=$?
diff --git a/xts5/configs/tetbuild.cfg.Linux b/xts5/configs/tetbuild.cfg.Linux
index e3f53a82..17320921 100644
--- a/xts5/configs/tetbuild.cfg.Linux
+++ b/xts5/configs/tetbuild.cfg.Linux
@@ -19,56 +19,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# $Header: /cvs/xtest/xtest/xts5/configs/tetbuild.cfg.Linux,v 1.6 2005-07-06 05:55:50 anderson Exp $
+# $Header: /cvs/xtest/xtest/xts5/configs/tetbuild.cfg.Linux,v 1.7 2005-11-01 01:38:05 idr Exp $
 #
 # Copyright (c) Applied Testing and Technology, Inc. 1995
 # All Rights Reserved.
 #
 # Project:     VSW5
 #
-# File:        tetbuild.cfg/tetclean/cfg
+# File:        tetbuild.cfg/tetclean.cfg
 #
 # Description:
 #       Build/clean configuration file for VSW5
-#
-# Modifications:
-# $Log: tetbuild.cfg.Linux,v $
-# Revision 1.6  2005-07-06 05:55:50  anderson
-# Get TET_ROOT from the env where it can be more easily set
-#
-# Revision 1.5  2005/04/19 04:45:44  anderson
-# s/vsw5/xts5/
-#
-# Revision 1.4  2005/04/19 04:24:53  anderson
-# Remove some personal settings
-#
-# Revision 1.3  2005/03/04 19:38:55  anderson
-# Passing GNU_SOURCE so we see caddr_t
-#
-# Revision 8.0  1998/12/23 23:39:35  mar
-# Branch point for Release 5.0.2
-#
-# Revision 7.0  1998/10/30 23:02:43  mar
-# Branch point for Release 5.0.2b1
-#
-# Revision 6.0  1998/03/02 05:30:35  tbr
-# Branch point for Release 5.0.1
-#
-# Revision 5.0  1998/01/26 03:27:09  tbr
-# Branch point for Release 5.0.1b1
-#
-# Revision 4.2  1998/01/22 01:28:18  tbr
-# Changes necessary to compile tests that genrate .dat files
-#
-# Revision 4.1  1997/10/26 22:35:22  andy
-# Editorial
-#
-# Revision 4.0  1995/12/15  09:25:58  tbr
-# Branch point for Release 5.0.0
-#
-# Revision 3.1  1995/12/15  00:33:05  andy
-# Prepare for GA Release
-#
 
 # Portions of this software are based on Xlib and X Protocol Test Suite.
 # We have used this material under the terms of its copyright, which grants
@@ -140,11 +101,11 @@ TET_BUILD_FILE=
 # TET_CLEAN_TOOL - The program to use as the TET clean tool.
 # This should normally be the wclean program supplied as part 
 # of the test suite.
-TET_CLEAN_TOOL=wclean
+TET_CLEAN_TOOL=wbuild
 
 # TET_CLEAN_FILE - This is intended to be used for the arguments to the TET
-# clean tool - this should be empty, since no arguments are accepted by wclean.
-TET_CLEAN_FILE=
+# clean tool - this *must* be 'clean'
+TET_CLEAN_FILE=clean
 
 # TET_OUTPUT_CAPTURE - This must be set to True.
 TET_OUTPUT_CAPTURE=TRUE
diff --git a/xts5/tetclean.cfg b/xts5/tetclean.cfg
index 7c501ef2..9962affb 100644
--- a/xts5/tetclean.cfg
+++ b/xts5/tetclean.cfg
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-# $Header: /cvs/xtest/xtest/xts5/tetclean.cfg,v 1.2 2005-04-21 09:40:42 ajosey Exp $
+# $Header: /cvs/xtest/xtest/xts5/tetclean.cfg,v 1.3 2005-11-01 01:38:05 idr Exp $
 #
 # Copyright (c) 2001,2004 The Open Group
 # Copyright (c) Applied Testing and Technology, Inc. 1995
@@ -103,11 +103,11 @@ TET_BUILD_FILE=
 # TET_CLEAN_TOOL - The program to use as the TET clean tool.
 # This should normally be the wclean program supplied as part 
 # of the test suite.
-TET_CLEAN_TOOL=wclean
+TET_CLEAN_TOOL=wbuild
 
 # TET_CLEAN_FILE - This is intended to be used for the arguments to the TET
-# clean tool - this should be empty, since no arguments are accepted by wclean.
-TET_CLEAN_FILE=
+# clean tool - this *must* be 'clean'
+TET_CLEAN_FILE=clean
 
 # TET_OUTPUT_CAPTURE - This must be set to True.
 TET_OUTPUT_CAPTURE=TRUE