diff options
| author | Robert Managan <managan1@llnl.gov> | 2008-09-22 19:43:02 (GMT) |
|---|---|---|
| committer | Robert Managan <managan1@llnl.gov> | 2008-09-22 19:43:02 (GMT) |
| commit | 1ae277fe2613da89e489134240a2cd3658363f1e (patch) | |
| tree | 5b3a601327def6116ded13d08ed99ebe0947531a /src/engine/SCons/Scanner | |
| parent | 17672e58d985d0bafb7052a4d4d3d0dd1c728cc2 (diff) | |
| download | SCons-1ae277fe2613da89e489134240a2cd3658363f1e.zip SCons-1ae277fe2613da89e489134240a2cd3658363f1e.tar.gz SCons-1ae277fe2613da89e489134240a2cd3658363f1e.tar.bz2 | |
Fix the Latex scanner to search for graphics on the TEXINPUTS path
instead of TEXPICTS.
Add the LATEXSUFFIXES keyword to the DummyEnvironment calls since
the scanner needs it.
Diffstat (limited to 'src/engine/SCons/Scanner')
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeX.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeXTests.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py index 3084505..fca845b 100644 --- a/src/engine/SCons/Scanner/LaTeX.py +++ b/src/engine/SCons/Scanner/LaTeX.py @@ -95,7 +95,7 @@ class LaTeX(SCons.Scanner.Base): """ keyword_paths = {'include': 'TEXINPUTS', 'input': 'TEXINPUTS', - 'includegraphics': 'TEXPICTS', + 'includegraphics': 'TEXINPUTS', 'bibliography': 'BIBINPUTS', 'bibliographystyle': 'BSTINPUTS', 'usepackage': 'TEXINPUTS'} diff --git a/src/engine/SCons/Scanner/LaTeXTests.py b/src/engine/SCons/Scanner/LaTeXTests.py index 9cfe3ca..4475834 100644 --- a/src/engine/SCons/Scanner/LaTeXTests.py +++ b/src/engine/SCons/Scanner/LaTeXTests.py @@ -111,7 +111,7 @@ def deps_match(self, deps, headers): class LaTeXScannerTestCase1(unittest.TestCase): def runTest(self): - env = DummyEnvironment() + env = DummyEnvironment(LATEXSUFFIXES = [".tex", ".ltx", ".latex"]) s = SCons.Scanner.LaTeX.LaTeXScanner() path = s.path(env) deps = s(env.File('test1.latex'), env, path) @@ -120,7 +120,7 @@ class LaTeXScannerTestCase1(unittest.TestCase): class LaTeXScannerTestCase2(unittest.TestCase): def runTest(self): - env = DummyEnvironment(TEXINPUTS=[test.workpath("subdir")]) + env = DummyEnvironment(TEXINPUTS=[test.workpath("subdir")],LATEXSUFFIXES = [".tex", ".ltx", ".latex"]) s = SCons.Scanner.LaTeX.LaTeXScanner() path = s.path(env) deps = s(env.File('test2.latex'), env, path) @@ -129,11 +129,11 @@ class LaTeXScannerTestCase2(unittest.TestCase): class LaTeXScannerTestCase3(unittest.TestCase): def runTest(self): - env = DummyEnvironment(TEXINPUTS=[test.workpath("subdir")]) + env = DummyEnvironment(TEXINPUTS=[test.workpath("subdir")],LATEXSUFFIXES = [".tex", ".ltx", ".latex"]) s = SCons.Scanner.LaTeX.LaTeXScanner() path = s.path(env) deps = s(env.File('test3.latex'), env, path) - files = ['subdir/inc4.eps', 'inc5.xyz'] + files = ['inc5.xyz', 'subdir/inc4.eps'] deps_match(self, deps, files) |