diff options
| author | Robert Managan <managan1@llnl.gov> | 2009-08-06 19:01:36 (GMT) |
|---|---|---|
| committer | Robert Managan <managan1@llnl.gov> | 2009-08-06 19:01:36 (GMT) |
| commit | cf18e652192998735ab1c35a1c2a160e8af915cd (patch) | |
| tree | 12fc085f2d264f77c49a1ce39abe21e9dd3daead /src | |
| parent | e2d1000960a2497c375f30c91f56322661237ecb (diff) | |
| download | SCons-cf18e652192998735ab1c35a1c2a160e8af915cd.zip SCons-cf18e652192998735ab1c35a1c2a160e8af915cd.tar.gz SCons-cf18e652192998735ab1c35a1c2a160e8af915cd.tar.bz2 | |
Move the definition of env['LATEXSUFFIXES'] from Defaults.py to the
various *tex.py generate functions.
This is to avoid adding LATEXSUFFIXES to the environment when
the tools are not loaded.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Defaults.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/latex.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/pdflatex.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/pdftex.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/tex.py | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index eba86e4..7ce981d 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -463,7 +463,7 @@ ConstructionEnvironment = { 'DSUFFIXES' : SCons.Tool.DSuffixes, 'ENV' : {}, 'IDLSUFFIXES' : SCons.Tool.IDLSuffixes, - 'LATEXSUFFIXES' : SCons.Tool.LaTeXSuffixes, +# 'LATEXSUFFIXES' : SCons.Tool.LaTeXSuffixes, # moved to the TeX tools generate functions '_concat' : _concat, '_defines' : _defines, '_stripixes' : _stripixes, diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py index 36c4fd2..8712d74 100644 --- a/src/engine/SCons/Tool/latex.py +++ b/src/engine/SCons/Tool/latex.py @@ -57,6 +57,8 @@ def generate(env): if LaTeXAction is None: LaTeXAction = SCons.Action.Action('$LATEXCOM', '$LATEXCOMSTR') + env.AppendUnique(LATEXSUFFIXES=SCons.Tool.LaTeXSuffixes) + import dvi dvi.generate(env) diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py index 81bdcd5..c4a8264 100644 --- a/src/engine/SCons/Tool/pdflatex.py +++ b/src/engine/SCons/Tool/pdflatex.py @@ -59,6 +59,8 @@ def generate(env): PDFLaTeXAuxAction = SCons.Action.Action(PDFLaTeXAuxFunction, strfunction=SCons.Tool.tex.TeXLaTeXStrFunction) + env.AppendUnique(LATEXSUFFIXES=SCons.Tool.LaTeXSuffixes) + import pdf pdf.generate(env) diff --git a/src/engine/SCons/Tool/pdftex.py b/src/engine/SCons/Tool/pdftex.py index fc09bf4..b487a8d 100644 --- a/src/engine/SCons/Tool/pdftex.py +++ b/src/engine/SCons/Tool/pdftex.py @@ -78,6 +78,8 @@ def generate(env): PDFTeXLaTeXAction = SCons.Action.Action(PDFTeXLaTeXFunction, strfunction=SCons.Tool.tex.TeXLaTeXStrFunction) + env.AppendUnique(LATEXSUFFIXES=SCons.Tool.LaTeXSuffixes) + import pdf pdf.generate(env) diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index 2fc13d1..26232db 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -621,6 +621,8 @@ def generate(env): TeXLaTeXAction = SCons.Action.Action(TeXLaTeXFunction, strfunction=TeXLaTeXStrFunction) + env.AppendUnique(LATEXSUFFIXES=SCons.Tool.LaTeXSuffixes) + import dvi dvi.generate(env) |