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.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4323 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index eba86e4acdd28994071992cb00cc1a0691944038..7ce981ddfccb8678e0ca714216274f1e186ab363 100644 (file)
--- 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 36c4fd26f393c591f78ab0258f0e18e9e8807fd3..8712d7434818948da5559be98bcad82024d90c59 100644 (file)
--- 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 81bdcd52c8e6befdb6be63c2c4518a9db345fbd8..c4a8264c6fdc053cd0f16cb2efd1df7a59e64ed4 100644 (file)
--- 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 fc09bf46c4ee3e19cd54ed177b0df54a09fa910b..b487a8d0162c57c96c252169b1a9927907bacd70 100644 (file)
--- 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 2fc13d14fdf61cd819e3434ac6a0bed084196579..26232db676c296358a7b973b46858d0b210ce67c 100644 (file)
--- 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)