diff options
| author | Robert Managan <managan1@llnl.gov> | 2008-09-04 18:05:49 (GMT) |
|---|---|---|
| committer | Robert Managan <managan1@llnl.gov> | 2008-09-04 18:05:49 (GMT) |
| commit | 6a4d9df86030463c35d40e1a314721eb546fb84e (patch) | |
| tree | 5fcab134f7685c3c589cd2b701d811b6cbc12131 /src/engine/SCons/Tool/latex.py | |
| parent | 43528ea6633d5d0d2005de38298b45d631642436 (diff) | |
| download | SCons-6a4d9df86030463c35d40e1a314721eb546fb84e.zip SCons-6a4d9df86030463c35d40e1a314721eb546fb84e.tar.gz SCons-6a4d9df86030463c35d40e1a314721eb546fb84e.tar.bz2 | |
Added a strfunction to the various tex builders. Since the sub-actions report
their commands as they build the strfunction only returns a string for
GetOption("no_exec") which covers --dry-run.
Therefore --dry-run now gets output, the first command to be run plus " ..."
to indicate that the ral builder may repeat or run bibtex, makeindex,...
Also updating the flags to pass -interaction=nonstopmode
This prevents errors in the .tex files from stopping the build
while Latex asks for input.
Updated several tests to handle this new flag by switching to getopt module
Diffstat (limited to 'src/engine/SCons/Tool/latex.py')
| -rw-r--r-- | src/engine/SCons/Tool/latex.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py index c4934c3..8258829 100644 --- a/src/engine/SCons/Tool/latex.py +++ b/src/engine/SCons/Tool/latex.py @@ -45,7 +45,8 @@ LaTeXAction = None def LaTeXAuxFunction(target = None, source= None, env=None): SCons.Tool.tex.InternalLaTeXAuxAction( LaTeXAction, target, source, env ) -LaTeXAuxAction = SCons.Action.Action(LaTeXAuxFunction, strfunction=None) +LaTeXAuxAction = SCons.Action.Action(LaTeXAuxFunction, + strfunction=SCons.Tool.tex.TeXLaTeXStrFunction) def generate(env): """Add Builders and construction variables for LaTeX to an Environment.""" @@ -63,7 +64,7 @@ def generate(env): bld.add_emitter('.latex', SCons.Tool.tex.tex_emitter) env['LATEX'] = 'latex' - env['LATEXFLAGS'] = SCons.Util.CLVar('') + env['LATEXFLAGS'] = SCons.Util.CLVar('-interaction=nonstopmode') env['LATEXCOM'] = 'cd ${TARGET.dir} && $LATEX $LATEXFLAGS ${SOURCE.file}' env['LATEXRETRIES'] = 3 |