From f77a946d58be75dd9f76d6f7ea4597ec48d88edb Mon Sep 17 00:00:00 2001 From: Robert Managan Date: Tue, 6 Sep 2011 22:18:10 +0000 Subject: Update path information for OSX. If one of the tools that use TeX applications is generated add the paths in /etc/paths and /etc/paths.d version 10.5 (Leopard) --- src/CHANGES.txt | 3 +++ src/engine/SCons/Platform/darwin.py | 26 +++++++++++++++++++++++++- src/engine/SCons/Tool/dvipdf.py | 1 + src/engine/SCons/Tool/dvips.py | 1 + src/engine/SCons/Tool/latex.py | 1 + src/engine/SCons/Tool/pdflatex.py | 1 + src/engine/SCons/Tool/pdftex.py | 1 + src/engine/SCons/Tool/tex.py | 33 +++++++++++++++++++++++++++++++++ test/TEX/LATEX2.py | 6 ++---- test/TEX/auxiliaries.py | 1 - test/TEX/bibliography.py | 2 +- test/TEX/bibtex-latex-rerun.py | 2 +- test/TEX/clean.py | 3 +-- test/TEX/configure.py | 3 +-- test/TEX/dryrun.py | 3 +-- test/TEX/eps_graphics.py | 2 +- test/TEX/eps_graphics2.py | 2 +- test/TEX/generated_files.py | 2 +- test/TEX/glossaries.py | 3 +-- test/TEX/input_docClass.py | 2 +- test/TEX/lstinputlisting.py | 2 +- test/TEX/makeindex.py | 3 +-- test/TEX/multi-line_include_options.py | 2 +- test/TEX/multi-run.py | 3 +-- test/TEX/multiple_include.py | 2 +- test/TEX/multiple_include_subdir.py | 2 +- test/TEX/nomencl.py | 2 +- test/TEX/rename_result.py | 5 ++--- test/TEX/subdir-as-include.py | 5 +---- test/TEX/subdir-input.py | 2 +- test/TEX/subdir_variantdir_include.py | 2 +- test/TEX/subdir_variantdir_include2.py | 2 +- test/TEX/subdir_variantdir_input.py | 2 +- test/TEX/usepackage.py | 5 ++--- test/TEX/variant_dir.py | 3 +-- test/TEX/variant_dir_bibunit.py | 2 +- test/TEX/variant_dir_dup0.py | 3 +-- test/TEX/variant_dir_style_dup0.py | 3 +-- 38 files changed, 98 insertions(+), 50 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b738ea8..79dfac1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -185,6 +185,9 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - Added support for the bibunits package so we call bibtex on all the bu*.aux files. + + - Add support of finding path information on OSX for TeX applications + MacPorts and Fink paths need to be added by the user From Russel Winder: diff --git a/src/engine/SCons/Platform/darwin.py b/src/engine/SCons/Platform/darwin.py index 070719e..005673b 100644 --- a/src/engine/SCons/Platform/darwin.py +++ b/src/engine/SCons/Platform/darwin.py @@ -33,11 +33,35 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import posix +import os def generate(env): posix.generate(env) env['SHLIBSUFFIX'] = '.dylib' - env['ENV']['PATH'] = env['ENV']['PATH'] + ':/sw/bin' + # put macports paths at front to override Apple's versions, fink path is after + # For now let people who want Macports or Fink tools specify it! + # env['ENV']['PATH'] = '/opt/local/bin:/opt/local/sbin:' + env['ENV']['PATH'] + ':/sw/bin' + + # Store extra system paths in env['ENV']['PATHOSX'] + + filelist = ['/etc/paths',] + # make sure this works on Macs with Tiger or earlier + try: + dirlist = os.listdir('/etc/paths.d') + except: + dirlist = [] + + for file in dirlist: + filelist.append('/etc/paths.d/'+file) + + for file in filelist: + if os.path.isfile(file): + f = open(file, 'r') + lines = f.readlines() + for line in lines: + if line: + env.AppendENVPath('PATHOSX', line.strip('\n')) + f.close() # Local Variables: # tab-width:4 diff --git a/src/engine/SCons/Tool/dvipdf.py b/src/engine/SCons/Tool/dvipdf.py index 56e90ea..7c41e9c 100644 --- a/src/engine/SCons/Tool/dvipdf.py +++ b/src/engine/SCons/Tool/dvipdf.py @@ -115,6 +115,7 @@ def generate(env): env['PDFCOM'] = ['$DVIPDFCOM'] def exists(env): + SCons.Tool.tex.generate_darwin(env) return env.Detect('dvipdf') # Local Variables: diff --git a/src/engine/SCons/Tool/dvips.py b/src/engine/SCons/Tool/dvips.py index c682a21..198bda0 100644 --- a/src/engine/SCons/Tool/dvips.py +++ b/src/engine/SCons/Tool/dvips.py @@ -85,6 +85,7 @@ def generate(env): env['PSSUFFIX'] = '.ps' def exists(env): + SCons.Tool.tex.generate_darwin(env) return env.Detect('dvips') # Local Variables: diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py index 283a8b4..1c71743 100644 --- a/src/engine/SCons/Tool/latex.py +++ b/src/engine/SCons/Tool/latex.py @@ -70,6 +70,7 @@ def generate(env): SCons.Tool.tex.generate_common(env) def exists(env): + SCons.Tool.tex.generate_darwin(env) return env.Detect('latex') # Local Variables: diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py index 78204d9..922e718 100644 --- a/src/engine/SCons/Tool/pdflatex.py +++ b/src/engine/SCons/Tool/pdflatex.py @@ -74,6 +74,7 @@ def generate(env): SCons.Tool.tex.generate_common(env) def exists(env): + SCons.Tool.tex.generate_darwin(env) return env.Detect('pdflatex') # Local Variables: diff --git a/src/engine/SCons/Tool/pdftex.py b/src/engine/SCons/Tool/pdftex.py index 33a41f2..30c56af 100644 --- a/src/engine/SCons/Tool/pdftex.py +++ b/src/engine/SCons/Tool/pdftex.py @@ -99,6 +99,7 @@ def generate(env): SCons.Tool.tex.generate_common(env) def exists(env): + SCons.Tool.tex.generate_darwin(env) return env.Detect('pdftex') # Local Variables: diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index 77e6e79..b0c518e 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -739,9 +739,28 @@ def generate(env): bld.add_action('.tex', TeXLaTeXAction) bld.add_emitter('.tex', tex_eps_emitter) +def generate_darwin(env): + try: + environ = env['ENV'] + except KeyError: + environ = {} + env['ENV'] = environ + + if (platform.system() == 'Darwin'): + try: + ospath = env['ENV']['PATHOSX'] + except: + ospath = None + if ospath: + env.AppendENVPath('PATH', ospath) + def generate_common(env): """Add internal Builders and construction variables for LaTeX to an Environment.""" + # Add OSX system paths so TeX tools can be found + # when a list of tools is given the exists() method is not called + generate_darwin(env) + # A generic tex file Action, sufficient for all tex files. global TeXAction if TeXAction is None: @@ -778,6 +797,19 @@ def generate_common(env): if MakeAcronymsAction is None: MakeAcronymsAction = SCons.Action.Action("$MAKEACRONYMSCOM", "$MAKEACRONYMSCOMSTR") + try: + environ = env['ENV'] + except KeyError: + environ = {} + env['ENV'] = environ + + # Some Linux platforms have pdflatex set up in a way + # that requires that the HOME environment variable be set. + # Add it here if defined. + v = os.environ.get('HOME') + if v: + environ['HOME'] = v + CDCOM = 'cd ' if platform.system() == 'Windows': # allow cd command to change drives on Windows @@ -824,6 +856,7 @@ def generate_common(env): env['MAKENCLCOM'] = CDCOM + '${TARGET.dir} && $MAKENCL ${SOURCE.filebase}.nlo $MAKENCLFLAGS -o ${SOURCE.filebase}.nls' def exists(env): + generate_darwin(env) return env.Detect('tex') # Local Variables: diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py index 8f4eaac..566f164 100644 --- a/test/TEX/LATEX2.py +++ b/test/TEX/LATEX2.py @@ -41,10 +41,8 @@ if latex: test.write('SConstruct', """ import os -ENV = { 'PATH' : os.environ['PATH'], - 'TEXINPUTS' : [ os.environ.get('TEXINPUTS', '') ] } -foo = Environment(ENV = ENV) -foo['TEXINPUTS'] = ['subdir',] +foo = Environment() +foo['TEXINPUTS'] = ['subdir',os.environ.get('TEXINPUTS', '')] foo.PDF(source = ['foo.ltx','bar.latex','makeindex.tex','latexi.tex']) """ % locals()) diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py index f6d7cb8..832e809 100644 --- a/test/TEX/auxiliaries.py +++ b/test/TEX/auxiliaries.py @@ -54,7 +54,6 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os env = Environment(tools = ['pdftex', 'dvipdf', 'dvips', 'tex', 'latex'], - ENV = {'PATH' : os.environ['PATH']}, BUILD_DIR = '#build/docs') # Use 'duplicate=1' because LaTeX toolchain does not work properly for diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py index 158fb92..5e26f6e 100644 --- a/test/TEX/bibliography.py +++ b/test/TEX/bibliography.py @@ -43,7 +43,7 @@ if not dvips or not bibtex: test.write('SConstruct', """\ import os -env = Environment(tools = ['tex', 'latex', 'dvips'],ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools = ['tex', 'latex', 'dvips']) env.PostScript('simple', 'simple.tex') """) diff --git a/test/TEX/bibtex-latex-rerun.py b/test/TEX/bibtex-latex-rerun.py index 1094f63..a2538f1 100644 --- a/test/TEX/bibtex-latex-rerun.py +++ b/test/TEX/bibtex-latex-rerun.py @@ -43,7 +43,7 @@ if not pdflatex: test.write(['SConstruct'], """\ import os -env = Environment(tools=['pdftex', 'tex'],ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools=['pdftex', 'tex']) env.PDF( 'bibtest.tex' ) """) diff --git a/test/TEX/clean.py b/test/TEX/clean.py index d7be478..7d17d81 100644 --- a/test/TEX/clean.py +++ b/test/TEX/clean.py @@ -68,8 +68,7 @@ bibfile = r""" test.write('SConstruct', """\ import os -env = Environment(tools = ['tex', 'latex'], - ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools = ['tex', 'latex']) env.DVI( "foo.ltx" ) """) diff --git a/test/TEX/configure.py b/test/TEX/configure.py index 0ac261c..60ebb9c 100644 --- a/test/TEX/configure.py +++ b/test/TEX/configure.py @@ -69,8 +69,7 @@ def CheckLModern(context): return is_ok import os -ENV = { 'PATH' : os.environ['PATH'] } -env = Environment(ENV = ENV) +env = Environment() env['TEXINPUTS'] = '.' conf = Configure( env, custom_tests={'CheckLModern' : CheckLModern} ) conf.CheckLModern() diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py index 3764426..308e167 100644 --- a/test/TEX/dryrun.py +++ b/test/TEX/dryrun.py @@ -43,8 +43,7 @@ if not latex: test.write('SConstruct', """ import os -ENV = { 'PATH' : os.environ['PATH'] } -foo = Environment(ENV = ENV) +foo = Environment() foo.DVI(target = 'foo.dvi', source = 'foo.ltx') """ % locals()) diff --git a/test/TEX/eps_graphics.py b/test/TEX/eps_graphics.py index 60abaf7..e0a8731 100644 --- a/test/TEX/eps_graphics.py +++ b/test/TEX/eps_graphics.py @@ -49,7 +49,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() test = env.DVI(source='docs/test.tex') """) diff --git a/test/TEX/eps_graphics2.py b/test/TEX/eps_graphics2.py index 241fa06..e523df7 100644 --- a/test/TEX/eps_graphics2.py +++ b/test/TEX/eps_graphics2.py @@ -50,7 +50,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() env.PDF('docs/Fig1.eps') test = env.PDF(source='docs/test.tex') diff --git a/test/TEX/generated_files.py b/test/TEX/generated_files.py index 35e0020..0325154 100644 --- a/test/TEX/generated_files.py +++ b/test/TEX/generated_files.py @@ -47,7 +47,7 @@ test.subdir(['src']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() copy_latex = Builder(action=Copy('$TARGET', '$SOURCE'), suffix='.tex', diff --git a/test/TEX/glossaries.py b/test/TEX/glossaries.py index 4050189..05ddf12 100644 --- a/test/TEX/glossaries.py +++ b/test/TEX/glossaries.py @@ -47,8 +47,7 @@ if not gloss==0: test.write('SConstruct', """\ import os -env = Environment(ENV = {'PATH' : os.environ['PATH'], - 'HOME' : os.environ['HOME']}) +env = Environment() env.PDF('glossaries', 'glossaries.tex') """) diff --git a/test/TEX/input_docClass.py b/test/TEX/input_docClass.py index 0b03c1f..3fa2b08 100644 --- a/test/TEX/input_docClass.py +++ b/test/TEX/input_docClass.py @@ -43,7 +43,7 @@ if not latex: test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() test = env.PDF(source='test.tex') """) diff --git a/test/TEX/lstinputlisting.py b/test/TEX/lstinputlisting.py index 57b8eae..4a02bca 100644 --- a/test/TEX/lstinputlisting.py +++ b/test/TEX/lstinputlisting.py @@ -43,7 +43,7 @@ if not pdflatex: test.write(['SConstruct'], """\ import os -DefaultEnvironment(ENV={'PATH':os.environ['PATH']}) +DefaultEnvironment() PDF("test.tex") """) diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py index 038c3f6..638224a 100644 --- a/test/TEX/makeindex.py +++ b/test/TEX/makeindex.py @@ -43,8 +43,7 @@ if not pdflatex or not makeindex: test.write('SConstruct', """\ import os -env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex'], - ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex']) env.PDF( "no_index.tex" ) env.PDF( "simple.tex" ) """) diff --git a/test/TEX/multi-line_include_options.py b/test/TEX/multi-line_include_options.py index 7d536dc..5266455 100644 --- a/test/TEX/multi-line_include_options.py +++ b/test/TEX/multi-line_include_options.py @@ -48,7 +48,7 @@ if not latex: test.write('SConstruct', """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() env.DVI('root.tex') """) diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py index 439699e..7e94be3 100644 --- a/test/TEX/multi-run.py +++ b/test/TEX/multi-run.py @@ -135,8 +135,7 @@ if tex: test.write(['work1', 'SConstruct'], """\ import os -env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex'], - ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex']) env.DVI( "foo.tex" ) env.PDF( "foo.tex" ) """) diff --git a/test/TEX/multiple_include.py b/test/TEX/multiple_include.py index 76225ca..0480d45 100644 --- a/test/TEX/multiple_include.py +++ b/test/TEX/multiple_include.py @@ -49,7 +49,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() env.PDF('Fig1.ps') test = env.PDF(source='test.tex') diff --git a/test/TEX/multiple_include_subdir.py b/test/TEX/multiple_include_subdir.py index 95853f0..ade4713 100644 --- a/test/TEX/multiple_include_subdir.py +++ b/test/TEX/multiple_include_subdir.py @@ -49,7 +49,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() env.PDF('docs/Fig1.eps') test = env.PDF(source='docs/test.tex') diff --git a/test/TEX/nomencl.py b/test/TEX/nomencl.py index 93a3c3b..1c121c0 100644 --- a/test/TEX/nomencl.py +++ b/test/TEX/nomencl.py @@ -47,7 +47,7 @@ if not nomencl==0: test.write('SConstruct', """\ import os -env = Environment(tools = ['pdftex'], ENV = {'PATH' : os.environ['PATH']}) +env = Environment(tools = ['pdftex']) env.PDF('nomencl', 'nomencl.tex') """) diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py index 0f098d0..f061e26 100644 --- a/test/TEX/rename_result.py +++ b/test/TEX/rename_result.py @@ -42,9 +42,8 @@ if not latex: test.write('SConstruct', """ import os -ENV = { 'PATH' : os.environ['PATH'], - 'TEXINPUTS' : [ 'subdir', os.environ.get('TEXINPUTS', '') ] } -foo = Environment(ENV = ENV) +foo = Environment() +foo['TEXINPUTS'] = [ 'subdir', os.environ.get('TEXINPUTS', '') ] foo.DVI(target = 'foobar.dvi', source = 'foo.ltx') foo.PDF(target = 'bar.xyz', source = 'bar.ltx') """ % locals()) diff --git a/test/TEX/subdir-as-include.py b/test/TEX/subdir-as-include.py index b24e7c7..8b897ca 100755 --- a/test/TEX/subdir-as-include.py +++ b/test/TEX/subdir-as-include.py @@ -49,10 +49,7 @@ test.subdir('inc') test.write('SConstruct', """\ import os -# I need PATH to allow TeX tools to be found on my desktop Mac -# and HOME to let them work properly on my work mainframe -env = Environment(ENV = {'PATH' : '/usr/texbin:/usr/local/bin:/opt/bin:/bin:/usr/bin:/sw/bin', - 'HOME' : os.environ['HOME']}) +env = Environment() env.DVI('root.tex') """) diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py index 98fb942..8c7febe 100644 --- a/test/TEX/subdir-input.py +++ b/test/TEX/subdir-input.py @@ -50,7 +50,7 @@ test.subdir('sub') test.write('SConstruct', """\ import os -env = Environment(TOOLS = ['tex', 'pdftex'], ENV = {'PATH' : os.environ['PATH']}) +env = Environment(TOOLS = ['tex', 'pdftex']) env.PDF( 'sub/x.tex' ) env.DVI( 'sub/x.tex' ) """) diff --git a/test/TEX/subdir_variantdir_include.py b/test/TEX/subdir_variantdir_include.py index a2a1f7e..7af3733 100644 --- a/test/TEX/subdir_variantdir_include.py +++ b/test/TEX/subdir_variantdir_include.py @@ -54,7 +54,7 @@ test.subdir(['docs','sub','sub2']) test.write('SConstruct', """\ import os -env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']}) +env = Environment(TOOLS = ['tex', 'pdftex']) env.VariantDir('build', 'docs',duplicate=0) env.SConscript('build/SConscript', exports = ['env']) diff --git a/test/TEX/subdir_variantdir_include2.py b/test/TEX/subdir_variantdir_include2.py index b195bc0..4dbc4d2 100644 --- a/test/TEX/subdir_variantdir_include2.py +++ b/test/TEX/subdir_variantdir_include2.py @@ -55,7 +55,7 @@ test.subdir(['docs','fig']) test.write('SConstruct', """\ import os -env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']}) +env = Environment(TOOLS = ['tex', 'pdftex']) env.VariantDir('build', 'docs', duplicate=0) pdf = env.PDF('build/main.tex') diff --git a/test/TEX/subdir_variantdir_input.py b/test/TEX/subdir_variantdir_input.py index 77a9d8c..efc0692 100644 --- a/test/TEX/subdir_variantdir_input.py +++ b/test/TEX/subdir_variantdir_input.py @@ -53,7 +53,7 @@ test.subdir(['docs','sub']) test.write('SConstruct', """\ import os -env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']}) +env = Environment(TOOLS = ['tex', 'pdftex']) env.VariantDir('build', 'docs',duplicate=0) env.SConscript('build/SConscript', exports = ['env']) diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py index aa7e79f..637956a 100644 --- a/test/TEX/usepackage.py +++ b/test/TEX/usepackage.py @@ -43,9 +43,8 @@ if not latex: test.write('SConstruct', """ import os -ENV = { 'PATH' : os.environ['PATH'], - 'TEXINPUTS' : [ 'subdir', os.environ.get('TEXINPUTS', '') ] } -foo = Environment(ENV = ENV) +foo = Environment() +foo['TEXINPUTS'] = [ 'subdir', os.environ.get('TEXINPUTS', '') ] foo.DVI(target = 'foo.dvi', source = 'foo.ltx') """ % locals()) diff --git a/test/TEX/variant_dir.py b/test/TEX/variant_dir.py index 2fcb96a..99c3523 100644 --- a/test/TEX/variant_dir.py +++ b/test/TEX/variant_dir.py @@ -45,8 +45,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }, - TOOLS = ['tex', 'latex', 'dvipdf']) +env = Environment(TOOLS = ['tex', 'latex', 'dvipdf']) Export(['env']) SConscript(os.path.join('docs', 'SConscript'), diff --git a/test/TEX/variant_dir_bibunit.py b/test/TEX/variant_dir_bibunit.py index 0603922..ce2c24e 100644 --- a/test/TEX/variant_dir_bibunit.py +++ b/test/TEX/variant_dir_bibunit.py @@ -54,7 +54,7 @@ test.subdir(['src']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env = Environment() Export(['env']) env.SConscript(os.path.join('src', 'SConscript'), diff --git a/test/TEX/variant_dir_dup0.py b/test/TEX/variant_dir_dup0.py index 0d4f4a9..25205f8 100644 --- a/test/TEX/variant_dir_dup0.py +++ b/test/TEX/variant_dir_dup0.py @@ -51,8 +51,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }, - TOOLS = ['tex', 'latex', 'dvipdf']) +env = Environment(TOOLS = ['tex', 'latex', 'dvipdf']) Export(['env']) SConscript(os.path.join('docs', 'SConscript'), diff --git a/test/TEX/variant_dir_style_dup0.py b/test/TEX/variant_dir_style_dup0.py index 4258cc5..711086f 100644 --- a/test/TEX/variant_dir_style_dup0.py +++ b/test/TEX/variant_dir_style_dup0.py @@ -54,8 +54,7 @@ test.subdir(['docs']) test.write(['SConstruct'], """\ import os -env = Environment(ENV = { 'PATH' : os.environ['PATH'] }, - TOOLS = ['tex', 'latex', 'dvipdf']) +env = Environment(tools = ['tex', 'latex', 'dvipdf']) copy_latex = Builder(action=Copy('$TARGET', '$SOURCE'), suffix='.tex', src_suffix='.src') -- cgit v0.12