diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 15 | ||||
| -rw-r--r-- | src/engine/SCons/Conftest.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/tex.py | 27 |
3 files changed, 18 insertions, 32 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8b2ab79..c4f50dc 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,26 +8,15 @@ -RELEASE X.X.X - XXX +RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 From Luca Falavigna: - Fix typos in the man page. - From Steven Knight: - - Make the messages for Configure checks of compilers consistent. - - From Rob Managan: - - Update tex builder to handle the case where a \input{foo} - command tries to work with a directory named foo instead of the - file foo.tex. The builder now ignores a directory and continues - searching to find the correct file. Thanks to Lennart Sauerbeck - for the test case and initial patch - - -RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 +RELEASE X.X.X - XXX From Jim Randall: - Fixed temp filename race condition on Windows with long cmd lines. diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py index 9210f87..e995e77 100644 --- a/src/engine/SCons/Conftest.py +++ b/src/engine/SCons/Conftest.py @@ -157,7 +157,7 @@ def CheckCC(context): too, so that it can test against non working flags. """ - context.Display("Checking whether the C compiler works... ") + context.Display("Checking whether the C compiler works") text = """ int main() { @@ -177,7 +177,7 @@ def CheckSHCC(context): too, so that it can test against non working flags. """ - context.Display("Checking whether the (shared) C compiler works... ") + context.Display("Checking whether the (shared) C compiler works") text = """ int foo() { @@ -197,7 +197,7 @@ def CheckCXX(context): too, so that it can test against non working flags. """ - context.Display("Checking whether the C++ compiler works... ") + context.Display("Checking whether the C++ compiler works") text = """ int main() { @@ -217,7 +217,7 @@ def CheckSHCXX(context): too, so that it can test against non working flags. """ - context.Display("Checking whether the (shared) C++ compiler works... ") + context.Display("Checking whether the (shared) C++ compiler works") text = """ int main() { diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index e0d1bd3..11e06bf 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -146,7 +146,7 @@ def FindFile(name,suffixes,paths,env,requireExt=False): testName = os.path.join(path,name) if Verbose: print " look for '%s'" % testName - if os.path.exists(testName) and os.path.isfile(testName): + if os.path.exists(testName): if Verbose: print " found '%s'" % testName return env.fs.File(testName) @@ -161,7 +161,7 @@ def FindFile(name,suffixes,paths,env,requireExt=False): if Verbose: print " look for '%s'" % testNameExt - if os.path.exists(testNameExt) and os.path.isfile(testNameExt): + if os.path.exists(testNameExt): if Verbose: print " found '%s'" % testNameExt return env.fs.File(testNameExt) @@ -268,7 +268,7 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None # Read the log file to find warnings/errors logfilename = targetbase + '.log' logContent = '' - if os.path.exists(logfilename) and os.path.isfile(logfilename): + if os.path.exists(logfilename): logContent = open(logfilename, "rb").read() @@ -276,7 +276,7 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None flsfilename = targetbase + '.fls' flsContent = '' auxfiles = [] - if os.path.exists(flsfilename) and os.path.isfile(flsfilename): + if os.path.exists(flsfilename): flsContent = open(flsfilename, "rb").read() auxfiles = openout_aux_re.findall(flsContent) if Verbose: @@ -290,7 +290,7 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None if count == 1: for auxfilename in auxfiles: target_aux = os.path.join(targetdir, auxfilename) - if os.path.exists(target_aux) and os.path.isfile(target_aux): + if os.path.exists(target_aux): content = open(target_aux, "rb").read() if string.find(content, "bibdata") != -1: if Verbose: @@ -375,10 +375,8 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None # end of while loop # rename Latex's output to what the target name is - if not (str(target[0]) == resultfilename and - os.path.exists(resultfilename) and - os.path.isfile(resultfilename)): - if os.path.exists(resultfilename) and os.path.isfile(resultfilename): + if not (str(target[0]) == resultfilename and os.path.exists(resultfilename)): + if os.path.exists(resultfilename): print "move %s to %s" % (resultfilename, str(target[0]), ) shutil.move(resultfilename,str(target[0])) @@ -600,11 +598,10 @@ def tex_emitter_core(target, source, env, graphics_extensions): content = source[0].get_text_contents() - # These never got used. Fix them anyway - #idx_exists = os.path.exists(targetbase + '.idx') and os.path.isfile(targetbase + '.idx') - #nlo_exists = os.path.exists(targetbase + '.nlo') and os.path.isfile(targetbase + '.nlo') - #glo_exists = os.path.exists(targetbase + '.glo') and os.path.isfile(targetbase + '.glo') - #acr_exists = os.path.exists(targetbase + '.acn') and os.path.isfile(targetbase + '.acn') + idx_exists = os.path.exists(targetbase + '.idx') + nlo_exists = os.path.exists(targetbase + '.nlo') + glo_exists = os.path.exists(targetbase + '.glo') + acr_exists = os.path.exists(targetbase + '.acn') # set up list with the regular expressions # we use to find features used @@ -683,7 +680,7 @@ def tex_emitter_core(target, source, env, graphics_extensions): env.Clean(target[0],aFile_base + '.aux') # read fls file to get all other files that latex creates and will read on the next pass # remove files from list that we explicitly dealt with above - if os.path.exists(flsfilename) and os.path.isfile(flsfilename): + if os.path.exists(flsfilename): content = open(flsfilename, "rb").read() out_files = openout_re.findall(content) myfiles = [auxfilename, logfilename, flsfilename, targetbase+'.dvi',targetbase+'.pdf'] |