Makefile
Jesse Michael,,,,
jmichael at gabe.freedesktop.org
Thu Nov 3 00:42:02 PST 2005
Update of /cvs/xtest/xtest/xts5
In directory gabe:/tmp/cvs-serv10910/xts5
Modified Files:
Makefile tetclean.cfg tetexec.cfg
Log Message:
clean up all vsw5 paths to use xts5 instead.
Index: Makefile
===================================================================
RCS file: /cvs/xtest/xtest/xts5/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 1 Nov 2005 01:38:05 -0000 1.6
+++ Makefile 3 Nov 2005 08:42:00 -0000 1.7
@@ -33,6 +33,9 @@
#
# Modifications:
# $Log$
+# Revision 1.7 2005/11/03 08:42:00 jmichael
+# clean up all vsw5 paths to use xts5 instead.
+#
# 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.
@@ -142,43 +145,43 @@
build: tetbuild.cfg
chmod ugo+x bin/wbuild
- @if [ -s $(TET_ROOT)/vsw5/results/install.log ]; \
+ @if [ -s $(TET_ROOT)/xts5/results/install.log ]; \
then \
- mv -f $(TET_ROOT)/vsw5/results/install.log $(TET_ROOT)/vsw5/results/install.log.o; \
+ mv -f $(TET_ROOT)/xts5/results/install.log $(TET_ROOT)/xts5/results/install.log.o; \
fi
- @(echo VSW5 INSTALLATION LOG|tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(date |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(uname -a |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(id |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libxtest |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/lib; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libXst |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libproto; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libximtest |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/xim; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libfonts |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/fonts; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libXR5 |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libXR5; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libXtaw |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libXtaw; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building libXtmu |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
+ @(echo VSW5 INSTALLATION LOG|tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(date |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(uname -a |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(id |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libxtest |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/lib; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libXst |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libproto; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libximtest |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/xim; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libfonts |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/fonts; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libXR5 |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libXR5; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libXtaw |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libXtaw; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building libXtmu |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
#not included in the Lite version
- @if [ -d $(TET_ROOT)/vsw5/src/libXtTest ]; \
+ @if [ -d $(TET_ROOT)/xts5/src/libXtTest ]; \
then \
- echo Building libXtTest |tee -a $(TET_ROOT)/vsw5/results/install.log; \
- cd $(TET_ROOT)/vsw5/src/libXtTest; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log; \
+ echo Building libXtTest |tee -a $(TET_ROOT)/xts5/results/install.log; \
+ cd $(TET_ROOT)/xts5/src/libXtTest; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log; \
fi
- @(echo Building mc utility |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/bin/mc; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building report generators |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/bin/reports; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo Building blowup utility |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/pixval/blowup; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo |tee -a $(TET_ROOT)/vsw5/results/install.log)
+ @(echo Building mc utility |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/bin/mc; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building report generators |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/bin/reports; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo Building blowup utility |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/pixval/blowup; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo |tee -a $(TET_ROOT)/xts5/results/install.log)
tetbuild.cfg:
cp configs/tetbuild.cfg.`uname` tetbuild.cfg
@@ -187,20 +190,20 @@
tcc -b
install:
- @(echo Setting 775 directory permissions |tee -a $(TET_ROOT)/vsw5/results/install.log)
+ @(echo Setting 775 directory permissions |tee -a $(TET_ROOT)/xts5/results/install.log)
@(find . -type d -print | xargs chmod 775)
- @(echo INSTALLATION OF LIBRARIES AND TOOLS COMPLETED |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(echo FONTS MUST ALSO BE INSTALLED BEFORE RUNNING TESTS |tee -a $(TET_ROOT)/vsw5/results/install.log)
+ @(echo INSTALLATION OF LIBRARIES AND TOOLS COMPLETED |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(echo FONTS MUST ALSO BE INSTALLED BEFORE RUNNING TESTS |tee -a $(TET_ROOT)/xts5/results/install.log)
athena:
- @(echo Building VSW Xaw and Xmu libraries |tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libXtaw; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
- @(cd $(TET_ROOT)/vsw5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
+ @(echo Building VSW Xaw and Xmu libraries |tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libXtaw; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
+ @(cd $(TET_ROOT)/xts5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/xts5/results/install.log)
clean:
@(cd src/lib; wbuild clean)
@(cd src/libXR5; wbuild clean)
- @if [ -d $(TET_ROOT)/vsw5/src/libXtTest ]; \
+ @if [ -d $(TET_ROOT)/xts5/src/libXtTest ]; \
then \
cd src/libXtTest; wbuild clean; \
fi
Index: tetclean.cfg
===================================================================
RCS file: /cvs/xtest/xtest/xts5/tetclean.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tetclean.cfg 1 Nov 2005 01:38:05 -0000 1.3
+++ tetclean.cfg 3 Nov 2005 08:42:00 -0000 1.4
@@ -223,7 +223,7 @@
XTESTFONTDIR=/usr/lib/X11/fonts/xtest
# XTESTROOT
-XTESTROOT=${TET_ROOT}/vsw5
+XTESTROOT=${TET_ROOT}/xts5
# XTTESTLIB - the Xt Tests' libraries
XTTESTLIB=${XTESTLIBDIR}/libXtTest.a
Index: tetexec.cfg
===================================================================
RCS file: /cvs/xtest/xtest/xts5/tetexec.cfg,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- tetexec.cfg 15 Apr 2005 14:05:06 -0000 1.1.1.2
+++ tetexec.cfg 3 Nov 2005 08:42:00 -0000 1.2
@@ -33,6 +33,9 @@
#
# Modifications:
# $Log$
+# Revision 1.2 2005/11/03 08:42:00 jmichael
+# clean up all vsw5 paths to use xts5 instead.
+#
# Revision 1.1.1.2 2005/04/15 14:05:06 anderson
# Reimport of the base with the legal name in the copyright fixed.
#
@@ -463,7 +466,7 @@
# XT_FONTDIR - The directory in which the VSW5 fonts are supplied (before
# being installed).
# This must be set such that appending a string gives a valid file name.
-# This is normally set to $TET_ROOT/vsw5/fonts/
+# This is normally set to $TET_ROOT/xts5/fonts/
# This is only used by the PV library which is not part of the test suite.
XT_FONTDIR=
More information about the xorg-test-commit
mailing list