Back out post-2.0 code changes from trunk: r4643, r4642 r4640, r4637.

This change should itself be backed out before merge "pending"
back into trunk.

2 files changed, 66 insertions, 78 deletions

diff --git a/test/TEX/dup_names.py b/test/TEX/dup_names.py
deleted file mode 100644
index 0017035..0000000
--- a/test/TEX/dup_names.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# 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.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Test whether duplicate base names are handled correctly. Basically there 
-is a directory and a file in the same location with the same basename 
-(foo/ and foo.tex). This test verifies \include{foo} includes foo.tex 
-and not the directory.
-
-Test configuration courtesy Lennart Sauerbeck.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-pdflatex = test.where_is('pdflatex')
-
-if not pdflatex:
-    test.skip_test("Could not find pdflatex; skipping test(s).\n")
-
-test.subdir(['foo'])
-
-test.write('SConstruct', """\
-import os
-env = Environment(tools = ['pdflatex'],
-                  ENV = {'PATH' : os.environ['PATH']})
-pdf = env.PDF( "base.ltx" )
-""")
-
-test.write('base.ltx', r"""
-\documentclass{article}
-
-\begin{document}
-\input{foo}
-\end{document}
-""")
-
-test.write('foo.tex', r"""
-Yes, this is a valid document.
-""")
-
-test.run(arguments = '.', stderr=None)
-
-test.must_exist(test.workpath('base.aux'))
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py
index cb1ae6f..68607b1 100644
--- a/test/TEX/subdir_variantdir_include2.py
+++ b/test/TEX/subdir_variantdir_include2.py
@@ -58,12 +58,15 @@ import os
 env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']})
 
 env.VariantDir('build', 'docs', duplicate=0)
+graph = env.PDF('build/fig/graph.eps')
 pdf = env.PDF('build/main.tex')
+Depends(pdf, graph)
 """)
 
 test.write(['docs','main.tex'],
 r"""\documentclass{article}
 \usepackage{makeidx}
+\usepackage{graphicx}
 \makeindex
 \begin{document}
 Hi there.
@@ -84,9 +87,70 @@ Sub-chapter 2
 
 """)
 
+test.write(['docs','fig','graph.eps'], """\
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: Fig1.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 4
+%%CreationDate: Tue Apr 25 09:56:11 2006
+%%For: managan@mangrove.llnl.gov (Rob Managan)
+%%BoundingBox: 0 0 98 98
+%%Magnification: 1.0000
+%%EndComments
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+
+end
+save
+newpath 0 98 moveto 0 0 lineto 98 0 lineto 98 98 lineto closepath clip newpath
+-24.9 108.2 translate
+1 -1 scale
+
+/gr {grestore} bind def
+/gs {gsave} bind def
+/rs {restore} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/sc {scale} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/tr {translate} bind def
+ /DrawEllipse {
+	/endangle exch def
+	/startangle exch def
+	/yrad exch def
+	/xrad exch def
+	/y exch def
+	/x exch def
+	/savematrix mtrx currentmatrix def
+	x y tr xrad yrad sc 0 0 1 startangle endangle arc
+	closepath
+	savematrix setmatrix
+	} def
+
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+$F2psBegin
+10 setmiterlimit
+ 0.06299 0.06299 sc
+%
+% Fig objects follow
+% 
+7.500 slw
+% Ellipse
+n 1170 945 766 766 0 360 DrawEllipse gs col0 s gr
+
+$F2psEnd
+rs
+""")
+
 #test.run(arguments = '.')
 test.run(arguments = '.', stderr=None, stdout=None)
-#test.run(arguments = 'build/main.pdf', stderr=None, stdout=None)
 
 test.must_exist(['build', 'main.aux'])
 test.must_exist(['build', 'main.fls'])
@@ -127,7 +191,7 @@ test.must_not_exist(['docs', 'content', 'chapter.aux'])
 test.up_to_date(arguments = '.', stderr=None, stdout=None)
 
 test.write(['docs','content', 'subchap.tex'], """\
-Sub-document 2a
+Sub-document 2
 """)
 
 test.not_up_to_date(arguments = '.')