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)

30 files changed, 32 insertions, 49 deletions

diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index 8f4eaac2..566f164a 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 f6d7cb8a..832e8098 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 158fb92b..5e26f6ef 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 1094f639..a2538f15 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 d7be478d..7d17d813 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 0ac261ca..60ebb9cd 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 37644266..308e1678 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 60abaf7e..e0a8731b 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 241fa06b..e523df7e 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 35e00208..03251549 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 40501893..05ddf128 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 0b03c1fa..3fa2b083 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 57b8eaec..4a02bca7 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 038c3f66..638224ae 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 7d536dcd..5266455c 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 439699e3..7e94be39 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 76225cad..0480d45b 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 95853f08..ade47135 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 93a3c3b3..1c121c02 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 0f098d08..f061e262 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 b24e7c74..8b897cad 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 98fb942f..8c7febe1 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 a2a1f7e9..7af37334 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 b195bc03..4dbc4d25 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 77a9d8cd..efc06926 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 aa7e79f5..637956a1 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 2fcb96a3..99c35236 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 0603922c..ce2c24e2 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 0d4f4a93..25205f8b 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 4258cc57..711086f6 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')