Merged revisions 4645,4647-4651,4654-4656 via svnmerge from

http://scons.tigris.org/svn/scons/branches/pending

........
  r4648 | managan | 2010-01-22 09:40:52 -0800 (Fri, 22 Jan 2010) | 9 lines

  Added dismbiguate calls on a targets side effects in the
  make_ready_all and make_ready_current routines of Taskmaster.py.
  This fixes Stefan Hepp's problem with latex. Directories to
  hold the side effect files were not created when using
  variantDir with duplicate=0

  Modifying subdir_variantdir_include2.py to run scons with an
  explicit target to reveal this problem.
........
  r4654 | stevenknight | 2010-01-27 07:41:01 -0800 (Wed, 27 Jan 2010) | 5 lines

  Issue 2534:  fix Scanners' default ability to return Dir nodes by
  making the default node_class the real SCons.Node.FS.Base class,
  not SCons.Node.FS.Entry (which is now, and has been for some time,
  a subclass).
........

1 files changed, 7 insertions, 67 deletions

diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py
index 68607b1..b195bc0 100644
--- a/test/TEX/subdir_variantdir_include2.py
+++ b/test/TEX/subdir_variantdir_include2.py
@@ -58,15 +58,12 @@ 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.
@@ -87,70 +84,13 @@ 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 = '.', stderr=None, stdout=None)
+
+# next line tests that side effect nodes get disambiguated 
+# and their directories created in a variantDir before 
+# the builder tries to populate them and fails
+test.run(arguments = 'build/main.pdf', stderr=None, stdout=None)
 
 test.must_exist(['build', 'main.aux'])
 test.must_exist(['build', 'main.fls'])
@@ -191,7 +131,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 2
+Sub-document 2a
 """)
 
 test.not_up_to_date(arguments = '.')