diff options
| -rw-r--r-- | README.rst | 19 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | bin/update-release-info.py | 7 | ||||
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/tex.py | 22 | ||||
| -rw-r--r-- | test/TEX/biber_biblatex2.py | 128 | ||||
| -rwxr-xr-x | test/TEX/biblatex.py | 2 | ||||
| -rw-r--r-- | test/update-release-info/update-release-info.py | 6 |
8 files changed, 170 insertions, 18 deletions
@@ -47,8 +47,9 @@ version at the SCons download page: Execution Requirements ====================== -Running SCons requires Python version 2.4 or later. There should be no other -dependencies or requirements to run SCons. +Running SCons requires Python version 2.4 or later (Python 3 is not +yet supported). There should be no other dependencies or requirements +to run SCons. The default SCons configuration assumes use of the Microsoft Visual C++ compiler suite on WIN32 systems, and assumes a C compiler named 'cc', a C++ @@ -156,12 +157,12 @@ Or on Windows:: By default, the above commands will do the following: - Install the version-numbered "scons-2.0.0" and "sconsign-2.0.0" scripts in - the default system script directory (/usr/bin or C:\Python*\Scripts, for + the default system script directory (/usr/bin or C:\\Python\*\\Scripts, for example). This can be disabled by specifying the "--no-version-script" option on the command line. - Install scripts named "scons" and "sconsign" scripts in the default system - script directory (/usr/bin or C:\Python*\Scripts, for example). This can be + script directory (/usr/bin or C:\\Python\*\\Scripts, for example). This can be disabled by specifying the "--no-scons-script" option on the command line, which is useful if you want to install and experiment with a new version before making it the default on your system. @@ -172,7 +173,7 @@ By default, the above commands will do the following: the command line. - Install "scons-2.0.0.bat" and "scons.bat" wrapper scripts in the Python - prefix directory on Windows (C:\Python*, for example). This can be disabled + prefix directory on Windows (C:\\Python\*, for example). This can be disabled by specifying the "--no-install-bat" option on the command line. On UNIX or Linux systems, the "--install-bat" option may be specified to @@ -183,7 +184,7 @@ By default, the above commands will do the following: - Install the SCons build engine (a Python module) in an appropriate version-numbered SCons library directory (/usr/lib/scons-2.0.0 or - C:\Python*\scons-2.0.0, for example). See below for more options related to + C:\\Python\*\\scons-2.0.0, for example). See below for more options related to installing the build engine library. - Install the troff-format man pages in an appropriate directory on UNIX or @@ -200,7 +201,7 @@ library modules (the build engine) in other Python scripts, specify the # python setup.py install --standard-lib This will install the build engine in the standard Python library directory -(/usr/lib/python*/site-packages or C:\Python*\Lib\site-packages). +(/usr/lib/python\*/site-packages or C:\\Python*\\Lib\\site-packages). Alternatively, you can have SCons install its build engine library in a hard-coded standalone library directory, instead of the default @@ -735,14 +736,18 @@ Steven Knight, knight at baldmt dot com, http://www.baldmt.com/~knight/ With plenty of help from the SCons Development team: - Chad Austin +- Dirk Baechle - Charles Crain - William Deegan - Steve Leblanc +- Rob Managan - Greg Noel - Gary Oberbrunner - Anthony Roach - Greg Spencer - Christoph Wiedemann +- Russel Winder +\... and many others. __COPYRIGHT__ @@ -1,7 +1,7 @@ # # SConstruct file to build scons packages during development. # -# See the README file for an overview of how SCons is built and tested. +# See the README.rst file for an overview of how SCons is built and tested. # When this gets changed, you must also change the copyright_years string # in QMTest/TestSCons.py so the test scripts look for the right string. diff --git a/bin/update-release-info.py b/bin/update-release-info.py index 44939114..338bba91 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -305,11 +305,10 @@ t.replace_assign('default_version', repr(version_string)) # Update README -t = UpdateFile('README') -if DEBUG: t.file = '/tmp/README' +t = UpdateFile('README.rst') +if DEBUG: t.file = '/tmp/README.rst' t.sub('-' + t.match_pat + '\.', '-' + version_string + '.', count = 0) -# the loop below can be removed after all 1.x.y releases are dead -for suf in ['tar', 'win32', 'zip']: +for suf in ['tar', 'win32', 'zip', 'rpm', 'exe', 'deb']: t.sub('-(\d+\.\d+\.\d+)\.%s' % suf, '-%s.%s' % (version_string, suf), count = 0) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ca6c5dfe..29cb6a33 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -40,6 +40,8 @@ RELEASE 2.X.X - From Rob Managan: - Updated the TeX builder to support the \newglossary command in LaTeX's glossaries package and the files it creates. + - Improve support for new versions of biblatex in the TeX builder + so biber is called automatically if biblatex requires it. RELEASE 2.2.0 - Mon, 05 Aug 2012 15:37:48 +0000 diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index 06957552..5f24df0a 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -129,6 +129,9 @@ LaTeXAction = None # An action to run BibTeX on a file. BibTeXAction = None +# An action to run Biber on a file. +BiberAction = None + # An action to run MakeIndex on a file. MakeIndexAction = None @@ -344,7 +347,9 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None must_rerun_latex = True # Now decide if biber will need to be run. - # The information that bibtex reads from the .bcf file is + # When the backend for biblatex is biber (by choice or default) the + # citation information is put in the .bcf file. + # The information that biber reads from the .bcf file is # pass-independent. If we find (below) that the .bbl file is unchanged, # then the last latex saw a correct bibliography. # Therefore only do this once @@ -357,11 +362,11 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None content = open(target_bcf, "rb").read() if content.find("bibdata") != -1: if Verbose: - print "Need to run bibtex on ",bcffilename + print "Need to run biber on ",bcffilename bibfile = env.fs.File(SCons.Util.splitext(target_bcf)[0]) - result = BibTeXAction(bibfile, bibfile, env) + result = BiberAction(bibfile, bibfile, env) if result != 0: - check_file_error_message(env['BIBTEX'], 'blg') + check_file_error_message(env['BIBER'], 'blg') must_rerun_latex = True # Now decide if latex will need to be run again due to index. @@ -880,6 +885,11 @@ def generate_common(env): if BibTeXAction is None: BibTeXAction = SCons.Action.Action("$BIBTEXCOM", "$BIBTEXCOMSTR") + # Define an action to run Biber on a file. + global BiberAction + if BiberAction is None: + BiberAction = SCons.Action.Action("$BIBERCOM", "$BIBERCOMSTR") + # Define an action to run MakeIndex on a file. global MakeIndexAction if MakeIndexAction is None: @@ -939,6 +949,10 @@ def generate_common(env): env['BIBTEXFLAGS'] = SCons.Util.CLVar('') env['BIBTEXCOM'] = CDCOM + '${TARGET.dir} && $BIBTEX $BIBTEXFLAGS ${SOURCE.filebase}' + env['BIBER'] = 'biber' + env['BIBERFLAGS'] = SCons.Util.CLVar('') + env['BIBERCOM'] = CDCOM + '${TARGET.dir} && $BIBER $BIBERFLAGS ${SOURCE.filebase}' + env['MAKEINDEX'] = 'makeindex' env['MAKEINDEXFLAGS'] = SCons.Util.CLVar('') env['MAKEINDEXCOM'] = CDCOM + '${TARGET.dir} && $MAKEINDEX $MAKEINDEXFLAGS ${SOURCE.file}' diff --git a/test/TEX/biber_biblatex2.py b/test/TEX/biber_biblatex2.py new file mode 100644 index 00000000..95b56171 --- /dev/null +++ b/test/TEX/biber_biblatex2.py @@ -0,0 +1,128 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Test creation of a Tex document that uses the biblatex package +It uses the default backend, could be bibtex or biber. +Require both be installed + +Test courtesy Rob Managan. +""" + +import TestSCons +import os + +test = TestSCons.TestSCons() + +latex = test.where_is('pdflatex') +if not latex: + test.skip_test("Could not find 'pdflatex'; skipping test.\n") + +biber = test.where_is('biber') +if not biber: + test.skip_test("Could not find 'biber'; skipping test.\n") + +bibtex = test.where_is('bibtex') +if not bibtex: + test.skip_test("Could not find 'bibtex'; skipping test.\n") + +biblatex = os.system('kpsewhich biblatex.sty') +if not biblatex==0: + test.skip_test("biblatex.sty not installed; skipping test(s).\n") + + +test.write(['SConstruct'], """\ +#!/usr/bin/env python + +import os +env = Environment(ENV=os.environ) +main_output = env.PDF('bibertest.tex') +""") + + +sources_bib_content = r""" +@book{mybook, + title={Title}, + author={Author, A}, + year={%s}, + publisher={Publisher}, +} +""" +test.write(['ref.bib'],sources_bib_content % '2013' ) + +test.write(['bibertest.tex'],r""" +\documentclass{article} + +\usepackage{biblatex} +\addbibresource{ref.bib} + +\begin{document} + +Hello. This is boring. +\cite{mybook} +And even more boring. + +\printbibliography +\end{document} +""") + + +test.run() + + +# All (?) the files we expect will get created in the docs directory +files = [ + 'bibertest.aux', + 'bibertest.bbl', + 'bibertest.blg', + 'bibertest.fls', + 'bibertest.log', + 'bibertest.pdf', + 'bibertest.run.xml', +] + + +for f in files: + test.must_exist([ f]) + +pdf_output_1 = test.read('bibertest.pdf') + + + +test.write(['ref.bib'],sources_bib_content % '1982') + +test.run() + +pdf_output_2 = test.read('bibertest.pdf') + +pdf_output_1 = test.normalize_pdf(pdf_output_1) +pdf_output_2 = test.normalize_pdf(pdf_output_2) + +# If the PDF file is the same as it was previously, then it didn't +# pick up the change from 1981 to 1982, so fail. +test.fail_test(pdf_output_1 == pdf_output_2) + +test.pass_test() diff --git a/test/TEX/biblatex.py b/test/TEX/biblatex.py index d0663f70..a70e103b 100755 --- a/test/TEX/biblatex.py +++ b/test/TEX/biblatex.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Test creation of a Tex document that uses the multibib package +Test creation of a Tex document that uses the biblatex package Test courtesy Rob Managan. """ diff --git a/test/update-release-info/update-release-info.py b/test/update-release-info/update-release-info.py index 654a25c1..d3125c7b 100644 --- a/test/update-release-info/update-release-info.py +++ b/test/update-release-info/update-release-info.py @@ -35,7 +35,7 @@ import TestRuntest this_year=time.localtime()[0] TestSCons = 'QMTest/TestSCons.py' .split('/') -README = 'README' .split('/') +README = 'README.rst' .split('/') ReleaseConfig = 'ReleaseConfig' .split('/') SConstruct = 'SConstruct' .split('/') Announce = 'src/Announce.txt' .split('/') @@ -154,6 +154,8 @@ These files are a part of 33.22.11: scons-33.22.11.tar.gz scons-33.22.11.win32.exe scons-33.22.11.zip + scons-33.22.11.rpm + scons-33.22.11.deb scons-33.22.11.beta.20012122112.suffix """) @@ -211,6 +213,8 @@ These files are a part of 33.22.11: scons-2.0.0.alpha.yyyymmdd.tar.gz scons-2.0.0.alpha.yyyymmdd.win32.exe scons-2.0.0.alpha.yyyymmdd.zip + scons-2.0.0.alpha.yyyymmdd.rpm + scons-2.0.0.alpha.yyyymmdd.deb scons-2.0.0.alpha.yyyymmdd.suffix """, mode = 'r') |