diff options
| author | Robert Managan <managan1@llnl.gov> | 2008-10-08 16:30:07 (GMT) |
|---|---|---|
| committer | Robert Managan <managan1@llnl.gov> | 2008-10-08 16:30:07 (GMT) |
| commit | 08bf8fbd0b18f1737ac101f3eba31d41b8c9fb5c (patch) | |
| tree | f2db9aab60c73c1c5476854985f7ef49cbe2394f /src | |
| parent | f50c85585ecd15a547257d311ff953d59fd94d09 (diff) | |
| download | SCons-08bf8fbd0b18f1737ac101f3eba31d41b8c9fb5c.zip SCons-08bf8fbd0b18f1737ac101f3eba31d41b8c9fb5c.tar.gz SCons-08bf8fbd0b18f1737ac101f3eba31d41b8c9fb5c.tar.bz2 | |
Testing on a Mac turned up a problem that did not show up on linux.
SK and I agree that we are surprised by that.
Both bld = env['BUILDERS']['PDF'] and bld = env['BUILDERS']['DVI'] had
lines like
bld.add_action('.tex', LaTeXAuxAction) # for DVI
bld.add_action('.tex', PDFLaTeXAuxAction) # for PDF
run from the initialization of two tools. This was a BAD thing.
That cured some test failures. For the rest I made all the TEX tests
initialize the environment with the os.environ PATH since the check
for the existence of the tools with where_is that looks on the system path.
So the tests still quietly exit if the tool is not on the system path
and now find if it is in a non-standard location like I have.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/latex.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/pdflatex.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py index 3201e01..e5e15d0 100644 --- a/src/engine/SCons/Tool/latex.py +++ b/src/engine/SCons/Tool/latex.py @@ -64,10 +64,8 @@ def generate(env): bld = env['BUILDERS']['DVI'] bld.add_action('.ltx', LaTeXAuxAction) bld.add_action('.latex', LaTeXAuxAction) - bld.add_action('.tex', LaTeXAuxAction) bld.add_emitter('.ltx', SCons.Tool.tex.tex_eps_emitter) bld.add_emitter('.latex', SCons.Tool.tex.tex_eps_emitter) - bld.add_emitter('.tex', SCons.Tool.tex.tex_eps_emitter) env['LATEX'] = 'latex' env['LATEXFLAGS'] = SCons.Util.CLVar('-interaction=nonstopmode') diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py index 241ed49..010fa11 100644 --- a/src/engine/SCons/Tool/pdflatex.py +++ b/src/engine/SCons/Tool/pdflatex.py @@ -63,10 +63,8 @@ def generate(env): bld = env['BUILDERS']['PDF'] bld.add_action('.ltx', PDFLaTeXAuxAction) bld.add_action('.latex', PDFLaTeXAuxAction) - bld.add_action('.tex', PDFLaTeXAuxAction) bld.add_emitter('.ltx', SCons.Tool.tex.tex_pdf_emitter) bld.add_emitter('.latex', SCons.Tool.tex.tex_pdf_emitter) - bld.add_emitter('.tex', SCons.Tool.tex.tex_pdf_emitter) env['PDFLATEX'] = 'pdflatex' env['PDFLATEXFLAGS'] = SCons.Util.CLVar('-interaction=nonstopmode') |