diff -Nru scons-3.0.0/CHANGES.txt scons-3.0.1/CHANGES.txt --- scons-3.0.0/CHANGES.txt 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/CHANGES.txt 2017-11-14 21:16:58.000000000 +0000 @@ -5,6 +5,44 @@ Change Log +RELEASE 3.0.1 - Mon, 14 Nov 2017 08:28:09 -0700 + + From Thomas Berg: + - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed + on the scope where SConstruct is executed, breaking existing builds using PY 2.7. + + From William Deegan: + - Fix issue where code in utility routine to_String_for_subst() had code whose result was never + properly returned. + (Found by: James Rinkevich https://pairlist4.pair.net/pipermail/scons-users/2017-October/006358.html ) + - Fixed Variables.GenerateHelpText() to now use the sort parameter. Due to incorrect 2to3 fixer changes + 8 years ago it was being used as a boolean parameter. Now you can specify sort to be a callable, or boolean + value. (True = normal sort). Manpage also updated. + - Fixed Tool loading logic from exploding sys.path with many site_scons/site_tools prepended on py3. + - Added additional output with time to process each SConscript file when using --debug=time. + - Fix broken subst logic where a string with "$$(abc)" was being treated as "$(abc) and the + logic for removing the signature escapes was then failing because there was no closing "$)". + This was introduced by a pull request to allow recursive variable evaluations to yield a string + such as "$( $( some stuff $) $)". + + From Daniel Moody: + - Jar can take multiple targets, and will make a duplicate jar from the sources for each target + - Added some warnings in case the Jar builder makes an implicit target + - Added Jar method and changed jar build to be more specific. Jar method will take in + directories or classes as source. Added more tests to JAR to ensure the jar was + packaged with the correct compiled class files. + - Added a No result test case to handle bug which seems unrelated to java in the + swig-dependencies.py test, more info here: http://scons.tigris.org/issues/show_bug.cgi?id=2907 + - Added a travis script to test on ubuntu trusty now that the project is on github + so that Continuus Integration tests can be run automatically. It tests most case and considers + no result a pass as well. Improving this script can install more dependincies allowing for more + tests to be run. + - Updated the Jar Builder tool in Tool/__init__.py so that is doesn't force class files as + sources, allowing directories to be passed, which was causing test/Java/JAR.py to fail. + + From Zachary Tessler: + - Fix incorrect warning for repeated identical builder calls that use overrides + RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 NOTE: This is a major release. You should expect that some targets may rebuild when upgrading. @@ -6138,4 +6176,4 @@ Copyright (c) 2001 - 2017 The SCons Foundation -src/CHANGES.txt rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog +src/CHANGES.txt 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog diff -Nru scons-3.0.0/debian/changelog scons-3.0.1/debian/changelog --- scons-3.0.0/debian/changelog 2017-10-13 07:08:24.000000000 +0000 +++ scons-3.0.1/debian/changelog 2017-12-14 14:57:20.000000000 +0000 @@ -1,3 +1,17 @@ +scons (3.0.1-1) unstable; urgency=medium + + * New upstream release: + - Refresh 0600-manpage-spelling.patch. + - Remove upstream applied 0125-printf_regression.patch. + * Change to my new email-address: + - debian/control, + - debian/copyright. + * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). + * debian/changelog: + - Remove trailing whitespace. + + -- Jörg Frings-Fürst Thu, 14 Dec 2017 15:57:20 +0100 + scons (3.0.0-2) unstable; urgency=high * New patch/0125-printf_regression.patch (Closes: #878327): @@ -50,11 +64,11 @@ * New upstream release. * Refresh patches. - * New debian/patches/0120-fix-bibtex-call.patch to create + * New debian/patches/0120-fix-bibtex-call.patch to create Bibtex bibliography always (Closes: #749716). * debian/watch: - bump version to 4 (no changes required). - * debian/copyright: + * debian/copyright: - Add year 2016. * debian/control: - Bump Standards-Version to 3.9.7 (no changes required). @@ -574,7 +588,7 @@ scons (0.07-3) unstable; urgency=low * Removing /usr/doc links - * Python 2.1 -> Python 2.2 + * Python 2.1 -> Python 2.2 -- Moshe Zadka Tue, 27 Aug 2002 18:48:02 +0300 @@ -590,7 +604,7 @@ * New upstream version * Packaging properly, instead of as debian native - * Modifying copyright to include upstream location (Closes: #144491) + * Modifying copyright to include upstream location (Closes: #144491) * Fixing my e-mail address (Closes: #144490) * Thanks for looking after my packages, tbm ;-) @@ -598,7 +612,7 @@ scons (0.06-1) unstable; urgency=low - * New upstream version + * New upstream version -- Moshe Zadka Mon, 15 Apr 2002 19:22:09 +0300 diff -Nru scons-3.0.0/debian/control scons-3.0.1/debian/control --- scons-3.0.0/debian/control 2017-10-13 06:44:01.000000000 +0000 +++ scons-3.0.1/debian/control 2017-12-14 14:56:14.000000000 +0000 @@ -1,13 +1,13 @@ Source: scons Section: devel Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 10), dh-python, python (>= 2.7~) -Standards-Version: 4.1.1 +Standards-Version: 4.1.2.0 X-Python-Version: >= 2.7 Homepage: http://www.scons.org/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git diff -Nru scons-3.0.0/debian/copyright scons-3.0.1/debian/copyright --- scons-3.0.0/debian/copyright 2017-10-03 04:25:00.000000000 +0000 +++ scons-3.0.1/debian/copyright 2017-12-14 14:56:14.000000000 +0000 @@ -17,12 +17,12 @@ Copyright: 2002 Moshe Zadka 2003-2008 Mark Brown 2008-2014 Luca Falavigna - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-3.0+ Files: debian/patches/* Copyright: 2010-2014 Luca Falavigna - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: Expat License: Expat diff -Nru scons-3.0.0/debian/patches/0600-manpage-spelling.patch scons-3.0.1/debian/patches/0600-manpage-spelling.patch --- scons-3.0.0/debian/patches/0600-manpage-spelling.patch 2017-10-03 04:25:00.000000000 +0000 +++ scons-3.0.1/debian/patches/0600-manpage-spelling.patch 2017-12-14 14:56:14.000000000 +0000 @@ -16,7 +16,7 @@ .RE .PP \-\-config=force -@@ -1472,7 +1472,7 @@ The tool definition (i\&.e\&. my_tool()) +@@ -1545,7 +1545,7 @@ The tool definition (i\&.e\&. my_tool()) .PP If no tool list is specified, then SCons will auto\-detect the installed tools using the PATH variable in the ENV construction variable and the platform name when the Environment is constructed\&. Changing the PATH variable after the Environment is constructed will not cause the tools to be redetected\&. .PP @@ -25,7 +25,7 @@ .sp .if n \{\ .RS 4 -@@ -6376,7 +6376,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6449,7 +6449,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS good_foo = [(\*(Aq$foobar\*(Aq, \*(Aq$foobar\*(Aq), (\*(Aq$foo\*(Aq, \*(Aq$foo\*(Aq)] env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBST_DICT = good_foo) @@ -34,7 +34,7 @@ bad_bar = {\*(Aq@bar@\*(Aq: \*(Aq@soap@\*(Aq, \*(Aq@soap@\*(Aq: \*(Aqlye\*(Aq} env\&.Substfile(\*(Aqbar\&.in\*(Aq, SUBST_DICT = bad_bar) -@@ -6608,7 +6608,7 @@ file\&. Note, that the updated +@@ -6681,7 +6681,7 @@ file\&. Note, that the updated POT and PO @@ -43,7 +43,7 @@ po/ directory contains LINGUAS -@@ -7148,7 +7148,7 @@ Example: +@@ -7221,7 +7221,7 @@ Example: AllowSubstExceptions() # Also allow a string containing a zero\-division expansion @@ -52,7 +52,7 @@ AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) .fi .if n \{\ -@@ -9123,7 +9123,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9196,7 +9196,7 @@ Return([vars\&.\&.\&., stop=]) .RS 4 By default, this stops processing the current SConscript file and returns to the calling SConscript file the values of the variables named in the \fIvars\fR @@ -61,7 +61,7 @@ \fBReturn\fR\&. Any strings that contain white space .sp The optional -@@ -10023,7 +10023,7 @@ function to create a copy of your source +@@ -10096,7 +10096,7 @@ function to create a copy of your source \fIvariant_dir\fR is not found but exists under \fIsrc_dir\fR, the file or directory is copied to @@ -70,7 +70,7 @@ .sp \fBVariantDir\fR -@@ -11290,7 +11290,7 @@ is used to create PDF output from an XML +@@ -11363,7 +11363,7 @@ is used to create PDF output from an XML .PP DOCBOOK_FOPFLAGS .RS 4 @@ -79,7 +79,7 @@ fop or xep\&. -@@ -11317,7 +11317,7 @@ is used to resolve XIncludes for a given +@@ -11390,7 +11390,7 @@ is used to resolve XIncludes for a given .PP DOCBOOK_XMLLINTFLAGS .RS 4 @@ -88,7 +88,7 @@ xmllint\&. .RE .PP -@@ -11348,7 +11348,7 @@ is used to transform an XML file via a g +@@ -11421,7 +11421,7 @@ is used to transform an XML file via a g .PP DOCBOOK_XSLTPROCFLAGS .RS 4 @@ -97,7 +97,7 @@ xsltproc (or saxon, -@@ -11357,7 +11357,7 @@ xalan)\&. +@@ -11430,7 +11430,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -106,7 +106,7 @@ saxon and saxon\-xslt, respectively\&. -@@ -14008,7 +14008,7 @@ A list of installed versions of the Metr +@@ -14081,7 +14081,7 @@ A list of installed versions of the Metr .PP NAME .RS 4 @@ -115,7 +115,7 @@ .RE .PP no_import_lib -@@ -16341,7 +16341,7 @@ builder\&. +@@ -16414,7 +16414,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -124,7 +124,7 @@ \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18279,7 +18279,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18354,7 +18354,7 @@ a = Action("build < ${SOURCE\&.file} > $ The \fBAction\fR() global function also takes an \fBexitstatfunc\fR diff -Nru scons-3.0.0/debian/patches/series scons-3.0.1/debian/patches/series --- scons-3.0.0/debian/patches/series 2017-10-13 06:22:22.000000000 +0000 +++ scons-3.0.1/debian/patches/series 2017-12-14 14:56:14.000000000 +0000 @@ -4,4 +4,4 @@ 0110-remove_stale_files.patch 0100-parallel_build.patch 0120-fix-bibtex-call.patch -0125-printf_regression.patch +#0125-printf_regression.patch diff -Nru scons-3.0.0/engine/SCons/Action.py scons-3.0.1/engine/SCons/Action.py --- scons-3.0.0/engine/SCons/Action.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Action.py 2017-11-14 21:16:57.000000000 +0000 @@ -98,7 +98,7 @@ # 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__ = "src/engine/SCons/Action.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Action.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import pickle diff -Nru scons-3.0.0/engine/SCons/Builder.py scons-3.0.1/engine/SCons/Builder.py --- scons-3.0.0/engine/SCons/Builder.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Builder.py 2017-11-14 21:16:57.000000000 +0000 @@ -98,7 +98,7 @@ # 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__ = "src/engine/SCons/Builder.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Builder.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import collections @@ -291,7 +291,14 @@ if t.side_effect: raise UserError("Multiple ways to build the same target were specified for: %s" % t) if t.has_explicit_builder(): - if not t.env is None and not t.env is env: + # Check for errors when the environments are different + # No error if environments are the same Environment instance + if (not t.env is None and not t.env is env and + # Check OverrideEnvironment case - no error if wrapped Environments + # are the same instance, and overrides lists match + not (getattr(t.env, '__subject', 0) is getattr(env, '__subject', 1) and + getattr(t.env, 'overrides', 0) == getattr(env, 'overrides', 1) and + not builder.multi)): action = t.builder.action t_contents = t.builder.action.get_contents(tlist, slist, t.env) contents = builder.action.get_contents(tlist, slist, env) @@ -300,7 +307,10 @@ msg = "Two different environments were specified for target %s,\n\tbut they appear to have the same action: %s" % (t, action.genstring(tlist, slist, t.env)) SCons.Warnings.warn(SCons.Warnings.DuplicateEnvironmentWarning, msg) else: - msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8')) + try: + msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8')) + except UnicodeDecodeError as e: + msg = "Two environments with different actions were specified for the same target: %s"%t raise UserError(msg) if builder.multi: if t.builder != builder: diff -Nru scons-3.0.0/engine/SCons/CacheDir.py scons-3.0.1/engine/SCons/CacheDir.py --- scons-3.0.0/engine/SCons/CacheDir.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/CacheDir.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/CacheDir.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/CacheDir.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """ CacheDir support diff -Nru scons-3.0.0/engine/SCons/compat/__init__.py scons-3.0.1/engine/SCons/compat/__init__.py --- scons-3.0.0/engine/SCons/compat/__init__.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/compat/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -57,7 +57,7 @@ rest of our code will find our pre-loaded compatibility module. """ -__revision__ = "src/engine/SCons/compat/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/compat/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import sys diff -Nru scons-3.0.0/engine/SCons/compat/_scons_dbm.py scons-3.0.1/engine/SCons/compat/_scons_dbm.py --- scons-3.0.0/engine/SCons/compat/_scons_dbm.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/compat/_scons_dbm.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ Python won't blow up even if dbm wasn't compiled in. """ -__revision__ = "src/engine/SCons/compat/_scons_dbm.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_dbm.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" class error(Exception): pass diff -Nru scons-3.0.0/engine/SCons/cpp.py scons-3.0.1/engine/SCons/cpp.py --- scons-3.0.0/engine/SCons/cpp.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/cpp.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/cpp.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/cpp.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """ SCons C Pre-Processor module diff -Nru scons-3.0.0/engine/SCons/Debug.py scons-3.0.1/engine/SCons/Debug.py --- scons-3.0.0/engine/SCons/Debug.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Debug.py 2017-11-14 21:16:57.000000000 +0000 @@ -31,7 +31,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Debug.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Debug.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import sys diff -Nru scons-3.0.0/engine/SCons/Defaults.py scons-3.0.1/engine/SCons/Defaults.py --- scons-3.0.0/engine/SCons/Defaults.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Defaults.py 2017-11-14 21:16:57.000000000 +0000 @@ -33,7 +33,7 @@ # from __future__ import division -__revision__ = "src/engine/SCons/Defaults.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Defaults.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os diff -Nru scons-3.0.0/engine/SCons/Environment.py scons-3.0.1/engine/SCons/Environment.py --- scons-3.0.0/engine/SCons/Environment.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Environment.py 2017-11-14 21:16:57.000000000 +0000 @@ -31,7 +31,7 @@ # 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__ = "src/engine/SCons/Environment.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Environment.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import copy diff -Nru scons-3.0.0/engine/SCons/Errors.py scons-3.0.1/engine/SCons/Errors.py --- scons-3.0.0/engine/SCons/Errors.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Errors.py 2017-11-14 21:16:57.000000000 +0000 @@ -28,7 +28,7 @@ """ -__revision__ = "src/engine/SCons/Errors.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Errors.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import shutil import SCons.Util diff -Nru scons-3.0.0/engine/SCons/Executor.py scons-3.0.1/engine/SCons/Executor.py --- scons-3.0.0/engine/SCons/Executor.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Executor.py 2017-11-14 21:16:57.000000000 +0000 @@ -28,7 +28,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import print_function -__revision__ = "src/engine/SCons/Executor.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Executor.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import collections diff -Nru scons-3.0.0/engine/SCons/exitfuncs.py scons-3.0.1/engine/SCons/exitfuncs.py --- scons-3.0.0/engine/SCons/exitfuncs.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/exitfuncs.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/exitfuncs.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/exitfuncs.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import atexit diff -Nru scons-3.0.0/engine/SCons/__init__.py scons-3.0.1/engine/SCons/__init__.py --- scons-3.0.0/engine/SCons/__init__.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,15 +27,15 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" -__version__ = "3.0.0" +__version__ = "3.0.1" -__build__ = "rel_3.0.0:4395:8972f6a2f699" +__build__ = "74b2c53bc42290e911b334a6b44f187da698a668" -__buildsys__ = "ubuntu-16" +__buildsys__ = "hpmicrodog" -__date__ = "2017/09/18 12:59:24" +__date__ = "2017/11/14 13:16:53" __developer__ = "bdbaddog" diff -Nru scons-3.0.0/engine/SCons/Job.py scons-3.0.1/engine/SCons/Job.py --- scons-3.0.0/engine/SCons/Job.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Job.py 2017-11-14 21:16:57.000000000 +0000 @@ -29,7 +29,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Job.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Job.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.compat diff -Nru scons-3.0.0/engine/SCons/Memoize.py scons-3.0.1/engine/SCons/Memoize.py --- scons-3.0.0/engine/SCons/Memoize.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Memoize.py 2017-11-14 21:16:57.000000000 +0000 @@ -22,7 +22,7 @@ # from __future__ import print_function -__revision__ = "src/engine/SCons/Memoize.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Memoize.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Memoizer diff -Nru scons-3.0.0/engine/SCons/Node/Alias.py scons-3.0.1/engine/SCons/Node/Alias.py --- scons-3.0.0/engine/SCons/Node/Alias.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Node/Alias.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/Alias.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Node/Alias.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import collections diff -Nru scons-3.0.0/engine/SCons/Node/FS.py scons-3.0.1/engine/SCons/Node/FS.py --- scons-3.0.0/engine/SCons/Node/FS.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Node/FS.py 2017-11-14 21:16:57.000000000 +0000 @@ -33,7 +33,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import print_function -__revision__ = "src/engine/SCons/Node/FS.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Node/FS.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import fnmatch import os diff -Nru scons-3.0.0/engine/SCons/Node/__init__.py scons-3.0.1/engine/SCons/Node/__init__.py --- scons-3.0.0/engine/SCons/Node/__init__.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Node/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -43,7 +43,7 @@ # 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__ = "src/engine/SCons/Node/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Node/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import collections import copy diff -Nru scons-3.0.0/engine/SCons/Node/Python.py scons-3.0.1/engine/SCons/Node/Python.py --- scons-3.0.0/engine/SCons/Node/Python.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Node/Python.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/Python.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Node/Python.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Node diff -Nru scons-3.0.0/engine/SCons/Options/BoolOption.py scons-3.0.1/engine/SCons/Options/BoolOption.py --- scons-3.0.0/engine/SCons/Options/BoolOption.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/BoolOption.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/BoolOption.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/BoolOption.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/Options/EnumOption.py scons-3.0.1/engine/SCons/Options/EnumOption.py --- scons-3.0.0/engine/SCons/Options/EnumOption.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/EnumOption.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/EnumOption.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/EnumOption.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/Options/__init__.py scons-3.0.1/engine/SCons/Options/__init__.py --- scons-3.0.0/engine/SCons/Options/__init__.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/Options/ListOption.py scons-3.0.1/engine/SCons/Options/ListOption.py --- scons-3.0.0/engine/SCons/Options/ListOption.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/ListOption.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/ListOption.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/ListOption.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/Options/PackageOption.py scons-3.0.1/engine/SCons/Options/PackageOption.py --- scons-3.0.0/engine/SCons/Options/PackageOption.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/PackageOption.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PackageOption.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/PackageOption.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/Options/PathOption.py scons-3.0.1/engine/SCons/Options/PathOption.py --- scons-3.0.0/engine/SCons/Options/PathOption.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Options/PathOption.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PathOption.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Options/PathOption.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff -Nru scons-3.0.0/engine/SCons/PathList.py scons-3.0.1/engine/SCons/PathList.py --- scons-3.0.0/engine/SCons/PathList.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/PathList.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/PathList.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/PathList.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """SCons.PathList diff -Nru scons-3.0.0/engine/SCons/Platform/aix.py scons-3.0.1/engine/SCons/Platform/aix.py --- scons-3.0.0/engine/SCons/Platform/aix.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/aix.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/aix.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/aix.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import subprocess diff -Nru scons-3.0.0/engine/SCons/Platform/cygwin.py scons-3.0.1/engine/SCons/Platform/cygwin.py --- scons-3.0.0/engine/SCons/Platform/cygwin.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/cygwin.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/cygwin.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/cygwin.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import posix from SCons.Platform import TempFileMunge diff -Nru scons-3.0.0/engine/SCons/Platform/darwin.py scons-3.0.1/engine/SCons/Platform/darwin.py --- scons-3.0.0/engine/SCons/Platform/darwin.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/darwin.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/darwin.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/darwin.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import posix import os diff -Nru scons-3.0.0/engine/SCons/Platform/hpux.py scons-3.0.1/engine/SCons/Platform/hpux.py --- scons-3.0.0/engine/SCons/Platform/hpux.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/hpux.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/hpux.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/hpux.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import posix diff -Nru scons-3.0.0/engine/SCons/Platform/__init__.py scons-3.0.1/engine/SCons/Platform/__init__.py --- scons-3.0.0/engine/SCons/Platform/__init__.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -43,7 +43,7 @@ # from __future__ import print_function -__revision__ = "src/engine/SCons/Platform/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.compat diff -Nru scons-3.0.0/engine/SCons/Platform/irix.py scons-3.0.1/engine/SCons/Platform/irix.py --- scons-3.0.0/engine/SCons/Platform/irix.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/irix.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/irix.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/irix.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import posix diff -Nru scons-3.0.0/engine/SCons/Platform/os2.py scons-3.0.1/engine/SCons/Platform/os2.py --- scons-3.0.0/engine/SCons/Platform/os2.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/os2.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/os2.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/os2.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import win32 def generate(env): diff -Nru scons-3.0.0/engine/SCons/Platform/posix.py scons-3.0.1/engine/SCons/Platform/posix.py --- scons-3.0.0/engine/SCons/Platform/posix.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/posix.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/posix.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/posix.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import errno import os diff -Nru scons-3.0.0/engine/SCons/Platform/sunos.py scons-3.0.1/engine/SCons/Platform/sunos.py --- scons-3.0.0/engine/SCons/Platform/sunos.py 2017-09-18 19:59:27.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/sunos.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/sunos.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/sunos.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" from . import posix diff -Nru scons-3.0.0/engine/SCons/Platform/win32.py scons-3.0.1/engine/SCons/Platform/win32.py --- scons-3.0.0/engine/SCons/Platform/win32.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Platform/win32.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/win32.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Platform/win32.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import os.path diff -Nru scons-3.0.0/engine/SCons/Scanner/C.py scons-3.0.1/engine/SCons/Scanner/C.py --- scons-3.0.0/engine/SCons/Scanner/C.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/C.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/C.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/C.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Node.FS import SCons.Scanner diff -Nru scons-3.0.0/engine/SCons/Scanner/Dir.py scons-3.0.1/engine/SCons/Scanner/Dir.py --- scons-3.0.0/engine/SCons/Scanner/Dir.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/Dir.py 2017-11-14 21:16:57.000000000 +0000 @@ -20,7 +20,7 @@ # 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__ = "src/engine/SCons/Scanner/Dir.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Dir.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Node.FS import SCons.Scanner diff -Nru scons-3.0.0/engine/SCons/Scanner/D.py scons-3.0.1/engine/SCons/Scanner/D.py --- scons-3.0.0/engine/SCons/Scanner/D.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/D.py 2017-11-14 21:16:57.000000000 +0000 @@ -30,7 +30,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/D.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/D.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Scanner diff -Nru scons-3.0.0/engine/SCons/Scanner/Fortran.py scons-3.0.1/engine/SCons/Scanner/Fortran.py --- scons-3.0.0/engine/SCons/Scanner/Fortran.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/Fortran.py 2017-11-14 21:16:57.000000000 +0000 @@ -26,7 +26,7 @@ # 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__ = "src/engine/SCons/Scanner/Fortran.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Fortran.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import re diff -Nru scons-3.0.0/engine/SCons/Scanner/IDL.py scons-3.0.1/engine/SCons/Scanner/IDL.py --- scons-3.0.0/engine/SCons/Scanner/IDL.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/IDL.py 2017-11-14 21:16:57.000000000 +0000 @@ -28,7 +28,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/IDL.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/IDL.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Node.FS import SCons.Scanner diff -Nru scons-3.0.0/engine/SCons/Scanner/__init__.py scons-3.0.1/engine/SCons/Scanner/__init__.py --- scons-3.0.0/engine/SCons/Scanner/__init__.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import re diff -Nru scons-3.0.0/engine/SCons/Scanner/LaTeX.py scons-3.0.1/engine/SCons/Scanner/LaTeX.py --- scons-3.0.0/engine/SCons/Scanner/LaTeX.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/LaTeX.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/LaTeX.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/LaTeX.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os.path import re diff -Nru scons-3.0.0/engine/SCons/Scanner/Prog.py scons-3.0.1/engine/SCons/Scanner/Prog.py --- scons-3.0.0/engine/SCons/Scanner/Prog.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/Prog.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/Prog.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Prog.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Node import SCons.Node.FS diff -Nru scons-3.0.0/engine/SCons/Scanner/RC.py scons-3.0.1/engine/SCons/Scanner/RC.py --- scons-3.0.0/engine/SCons/Scanner/RC.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/RC.py 2017-11-14 21:16:57.000000000 +0000 @@ -28,7 +28,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/RC.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/RC.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import re diff -Nru scons-3.0.0/engine/SCons/Scanner/SWIG.py scons-3.0.1/engine/SCons/Scanner/SWIG.py --- scons-3.0.0/engine/SCons/Scanner/SWIG.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Scanner/SWIG.py 2017-11-14 21:16:57.000000000 +0000 @@ -27,7 +27,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/SWIG.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/SWIG.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.Scanner diff -Nru scons-3.0.0/engine/SCons/SConf.py scons-3.0.1/engine/SCons/SConf.py --- scons-3.0.0/engine/SCons/SConf.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/SConf.py 2017-11-14 21:16:57.000000000 +0000 @@ -35,7 +35,7 @@ # from __future__ import print_function -__revision__ = "src/engine/SCons/SConf.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/SConf.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.compat diff -Nru scons-3.0.0/engine/SCons/SConsign.py scons-3.0.1/engine/SCons/SConsign.py --- scons-3.0.0/engine/SCons/SConsign.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/SConsign.py 2017-11-14 21:16:57.000000000 +0000 @@ -29,7 +29,7 @@ from __future__ import print_function -__revision__ = "src/engine/SCons/SConsign.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/SConsign.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.compat diff -Nru scons-3.0.0/engine/SCons/Script/__init__.py scons-3.0.1/engine/SCons/Script/__init__.py --- scons-3.0.0/engine/SCons/Script/__init__.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Script/__init__.py 2017-11-14 21:16:57.000000000 +0000 @@ -34,7 +34,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Script/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import time start_time = time.time() diff -Nru scons-3.0.0/engine/SCons/Script/Interactive.py scons-3.0.1/engine/SCons/Script/Interactive.py --- scons-3.0.0/engine/SCons/Script/Interactive.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Script/Interactive.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import print_function -__revision__ = "src/engine/SCons/Script/Interactive.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Script/Interactive.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __doc__ = """ SCons interactive mode diff -Nru scons-3.0.0/engine/SCons/Script/Main.py scons-3.0.1/engine/SCons/Script/Main.py --- scons-3.0.0/engine/SCons/Script/Main.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Script/Main.py 2017-11-14 21:16:57.000000000 +0000 @@ -38,7 +38,7 @@ # 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__ = "src/engine/SCons/Script/Main.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Script/Main.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons.compat diff -Nru scons-3.0.0/engine/SCons/Script/SConscript.py scons-3.0.1/engine/SCons/Script/SConscript.py --- scons-3.0.0/engine/SCons/Script/SConscript.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Script/SConscript.py 2017-11-14 21:16:57.000000000 +0000 @@ -5,8 +5,6 @@ """ -from __future__ import print_function - # # Copyright (c) 2001 - 2017 The SCons Foundation # @@ -29,7 +27,7 @@ # 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__ = "src/engine/SCons/Script/SConscript.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConscript.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import SCons import SCons.Action @@ -46,12 +44,15 @@ import SCons.Tool import SCons.Util +from . import Main + import collections import os import os.path import re import sys import traceback +import time class SConscriptReturn(Exception): pass @@ -249,11 +250,17 @@ try: try: # _file_ = SCons.Util.to_str(_file_) + if Main.print_time: + time1 = time.time() exec(compile(_file_.read(), _file_.name, 'exec'), call_stack[-1].globals) except SConscriptReturn: pass finally: + if Main.print_time: + time2 = time.time() + print('SConscript:%s took %0.3f ms' % (f.get_abspath(), (time2 - time1) * 1000.0)) + if old_file is not None: call_stack[-1].globals.update({__file__:old_file}) else: diff -Nru scons-3.0.0/engine/SCons/Script/SConsOptions.py scons-3.0.1/engine/SCons/Script/SConsOptions.py --- scons-3.0.0/engine/SCons/Script/SConsOptions.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Script/SConsOptions.py 2017-11-14 21:16:57.000000000 +0000 @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConsOptions.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConsOptions.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import optparse import re diff -Nru scons-3.0.0/engine/SCons/Subst.py scons-3.0.1/engine/SCons/Subst.py --- scons-3.0.0/engine/SCons/Subst.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Subst.py 2017-11-14 21:16:57.000000000 +0000 @@ -26,7 +26,7 @@ # 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__ = "src/engine/SCons/Subst.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Subst.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import collections import re @@ -338,7 +338,10 @@ SUBST_SIG = 2 _rm = re.compile(r'\$[()]') -_rm_split = re.compile(r'(\$[()])') + +# Note the pattern below only matches $( or $) when there is no +# preceeding $. (Thus the (? b) - (a < b) + + # Local Variables: # tab-width:4 # indent-tabs-mode:nil diff -Nru scons-3.0.0/engine/SCons/Variables/BoolVariable.py scons-3.0.1/engine/SCons/Variables/BoolVariable.py --- scons-3.0.0/engine/SCons/Variables/BoolVariable.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/BoolVariable.py 2017-11-14 21:16:58.000000000 +0000 @@ -34,7 +34,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/BoolVariable.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/BoolVariable.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __all__ = ['BoolVariable',] diff -Nru scons-3.0.0/engine/SCons/Variables/EnumVariable.py scons-3.0.1/engine/SCons/Variables/EnumVariable.py --- scons-3.0.0/engine/SCons/Variables/EnumVariable.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/EnumVariable.py 2017-11-14 21:16:58.000000000 +0000 @@ -37,7 +37,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/EnumVariable.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/EnumVariable.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __all__ = ['EnumVariable',] diff -Nru scons-3.0.0/engine/SCons/Variables/__init__.py scons-3.0.1/engine/SCons/Variables/__init__.py --- scons-3.0.0/engine/SCons/Variables/__init__.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/__init__.py 2017-11-14 21:16:58.000000000 +0000 @@ -26,10 +26,11 @@ # 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__ = "src/engine/SCons/Variables/__init__.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/__init__.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os.path import sys +from functools import cmp_to_key import SCons.Environment import SCons.Errors @@ -287,9 +288,13 @@ env - an environment that is used to get the current values of the options. + cmp - Either a function as follows: The specific sort function should take two arguments and return -1, 0 or 1 + or a boolean to indicate if it should be sorted. """ - if sort: + if callable(sort): + options = sorted(self.options, key=cmp_to_key(lambda x,y: sort(x.key,y.key))) + elif sort is True: options = sorted(self.options, key=lambda x: x.key) else: options = self.options diff -Nru scons-3.0.0/engine/SCons/Variables/ListVariable.py scons-3.0.1/engine/SCons/Variables/ListVariable.py --- scons-3.0.0/engine/SCons/Variables/ListVariable.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/ListVariable.py 2017-11-14 21:16:58.000000000 +0000 @@ -46,7 +46,7 @@ # 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__ = "src/engine/SCons/Variables/ListVariable.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/ListVariable.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" # Known Bug: This should behave like a Set-Type, but does not really, # since elements can occur twice. diff -Nru scons-3.0.0/engine/SCons/Variables/PackageVariable.py scons-3.0.1/engine/SCons/Variables/PackageVariable.py --- scons-3.0.0/engine/SCons/Variables/PackageVariable.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/PackageVariable.py 2017-11-14 21:16:58.000000000 +0000 @@ -50,7 +50,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/PackageVariable.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/PackageVariable.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __all__ = ['PackageVariable',] diff -Nru scons-3.0.0/engine/SCons/Variables/PathVariable.py scons-3.0.1/engine/SCons/Variables/PathVariable.py --- scons-3.0.0/engine/SCons/Variables/PathVariable.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Variables/PathVariable.py 2017-11-14 21:16:58.000000000 +0000 @@ -67,7 +67,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/PathVariable.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Variables/PathVariable.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" __all__ = ['PathVariable',] diff -Nru scons-3.0.0/engine/SCons/Warnings.py scons-3.0.1/engine/SCons/Warnings.py --- scons-3.0.0/engine/SCons/Warnings.py 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/engine/SCons/Warnings.py 2017-11-14 21:16:58.000000000 +0000 @@ -27,7 +27,7 @@ """ -__revision__ = "src/engine/SCons/Warnings.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/engine/SCons/Warnings.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import sys diff -Nru scons-3.0.0/PKG-INFO scons-3.0.1/PKG-INFO --- scons-3.0.0/PKG-INFO 2017-09-18 20:00:12.000000000 +0000 +++ scons-3.0.1/PKG-INFO 2017-11-14 21:18:30.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: scons -Version: 3.0.0 +Version: 3.0.1 Summary: Open Source next-generation build tool. Home-page: http://www.scons.org/ Author: Steven Knight diff -Nru scons-3.0.0/README.txt scons-3.0.1/README.txt --- scons-3.0.0/README.txt 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/README.txt 2017-11-14 21:16:58.000000000 +0000 @@ -2,7 +2,7 @@ SCons - a software construction tool - Version 3.0.0 + Version 3.0.1 This is SCons, a tool for building software (and other files). SCons is @@ -57,7 +57,7 @@ By default, the above command will do the following: - -- Install the version-numbered "scons-3.0.0" and "sconsign-3.0.0" + -- Install the version-numbered "scons-3.0.1" and "sconsign-3.0.1" scripts in 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 @@ -71,17 +71,17 @@ making it the default on your system. On UNIX or Linux systems, you can have the "scons" and "sconsign" - scripts be hard links or symbolic links to the "scons-3.0.0" and - "sconsign-3.0.0" scripts by specifying the "--hardlink-scons" + scripts be hard links or symbolic links to the "scons-3.0.1" and + "sconsign-3.0.1" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-3.0.0.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-3.0.1.bat" and "scons.bat" wrapper scripts in the Python 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 have "scons-3.0.0.bat" and "scons.bat" files + specified to have "scons-3.0.1.bat" and "scons.bat" files installed in the default system script directory, which is useful if you want to install SCons in a shared file system directory that can be used to execute SCons from both UNIX/Linux and @@ -89,7 +89,7 @@ -- Install the SCons build engine (a Python module) in an appropriate version-numbered SCons library directory - (/usr/lib/scons-3.0.0 or C:\Python*\scons-3.0.0, for example). + (/usr/lib/scons-3.0.1 or C:\Python*\scons-3.0.1, for example). See below for more options related to installing the build engine library. diff -Nru scons-3.0.0/RELEASE.txt scons-3.0.1/RELEASE.txt --- scons-3.0.0/RELEASE.txt 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/RELEASE.txt 2017-11-14 21:16:58.000000000 +0000 @@ -1,15 +1,37 @@ - A new SCons checkpoint release, 3.0.0, is now available + A new SCons checkpoint release, 3.0.1, is now available on the SCons download page: http://www.scons.org/download.php + XXX The primary purpose of this release ... XXX - Here is a summary of the changes since 2.5.1: + A SCons "checkpoint release" is intended to provide early access to + new features so they can be tested in the field before being released + for adoption by other software distributions. + + Note that a checkpoint release is developed using the same test-driven + development methodology as all SCons releases. Existing SCons + functionality should all work as it does in previous releases (except + for any changes identified in the release notes) and early adopters + should be able to use a checkpoint release safely for production work + with existing SConscript files. If not, it represents not only a bug + in SCons but also a hole in the regression test suite, and we want to + hear about it. + + New features may be more lightly tested than in past releases, + especially as concerns their interaction with all of the other + functionality in SCons. We are especially interested in hearing bug + reports about new functionality. + + We do not recommend that downstream distributions (Debian, Fedora, + etc.) package a checkpoint release, mainly to avoid confusing the + "public" release numbering with the long checkpoint release names. + + Here is a summary of the changes since 1.3.0: NEW FUNCTIONALITY - - Initial support for Python 3.5+ - - I + - List new features (presumably why a checkpoint is being released) DEPRECATED FUNCTIONALITY @@ -48,4 +70,4 @@ Contributors are listed alphabetically by their last name. Copyright (c) 2001 - 2017 The SCons Foundation -src/RELEASE.txt rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog +src/RELEASE.txt 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog diff -Nru scons-3.0.0/scons.1 scons-3.0.1/scons.1 --- scons-3.0.0/scons.1 2017-09-18 20:00:09.000000000 +0000 +++ scons-3.0.1/scons.1 2017-11-14 21:18:26.000000000 +0000 @@ -3,11 +3,11 @@ .\" Author: Steven Knight .\" Generator: DocBook XSL Stylesheets v1.76.1 .\" Date: 2004 - 2016 -.\" Manual: SCons 3.0.0 -.\" Source: SCons 3.0.0 version 3.0.0 +.\" Manual: SCons 3.0.1 +.\" Source: SCons 3.0.1 version 3.0.1 .\" Language: English .\" -.TH "SCONS" "1" "2004 - 2016" "SCons 3\&.0\&.0 version 3.0.0" "SCons 3\&.0\&.0" +.TH "SCONS" "1" "2004 - 2016" "SCons 3\&.0\&.1 version 3.0.1" "SCons 3\&.0\&.1" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -606,7 +606,80 @@ .PP \-\-debug=time .RS 4 -Prints various time profiling information: the time spent executing each individual build command; the total build time (time SCons ran from beginning to end); the total time spent reading and executing SConscript files; the total time spent SCons itself spend running (that is, not counting reading and executing SConscript files); and both the total time spent executing all build commands and the elapsed wall\-clock time spent executing those build commands\&. (When +Prints various time profiling information: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The time spent executing each individual build command.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The total build time (time SCons ran from beginning to end).RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The total time spent reading and executing SConscript files.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The total time spent SCons itself spend running +(that is, not counting reading and executing SConscript files).RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The total time spent executing all build commands.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The elapsed wall\-clock time spent executing those build commands.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +The time spent processing each file passed to the \fISConscript()\fR function.RE +.sp +(When \fBscons\fR is executed without the \fB\-j\fR @@ -3192,6 +3265,11 @@ \fB$ASPPCOMSTR\fR\&. .RE .PP +packaging +.RS 4 +A framework for building binary and source packages\&. +.RE +.PP Packaging .RS 4 Sets construction variables for the @@ -3199,11 +3277,6 @@ Builder\&. .RE .PP -packaging -.RS 4 -A framework for building binary and source packages\&. -.RE -.PP pdf .RS 4 Sets construction variables for the Portable Document Format builder\&. @@ -12545,14 +12618,14 @@ .PP HOST_ARCH .RS 4 +The name of the host hardware architecture used to create the Environment\&. If a platform is specified when creating the Environment, then that Platform\*(Aqs logic will handle setting this value\&. This value is immutable, and should not be changed by the user after the Environment is initialized\&. Currently only set for Win32\&. +.sp Sets the host architecture for Visual Studio compiler\&. If not set, default to the detected host architecture: note that this may depend on the python you are using\&. This variable must be passed as an argument to the Environment() constructor; setting it later has no effect\&. .sp Valid values are the same as for \fB$TARGET_ARCH\fR\&. .sp This is currently only used on Windows, but in the future it will be used on other OSes as well\&. -.sp -The name of the host hardware architecture used to create the Environment\&. If a platform is specified when creating the Environment, then that Platform\*(Aqs logic will handle setting this value\&. This value is immutable, and should not be changed by the user after the Environment is initialized\&. Currently only set for Win32\&. .RE .PP HOST_OS @@ -15392,16 +15465,6 @@ values include \*(Aq1\*(Aq, \*(Aq1\&.2\&.3\*(Aq, and \*(Aq1\&.2\&.gitaa412c8b\*(Aq\&. .RE .PP -SHLIBVERSIONFLAGS -.RS 4 -Extra flags added to -\fB$SHLINKCOM\fR -when building versioned -\fBSharedLibrary\fR\&. These flags are only used when -\fB$SHLIBVERSION\fR -is set\&. -.RE -.PP _SHLIBVERSIONFLAGS .RS 4 This macro automatically introduces extra flags to @@ -15418,6 +15481,16 @@ \-Wl,\-soname=$_SHLIBSONAME\&. It is unused by "plain" (unversioned) shared libraries\&. .RE .PP +SHLIBVERSIONFLAGS +.RS 4 +Extra flags added to +\fB$SHLINKCOM\fR +when building versioned +\fBSharedLibrary\fR\&. These flags are only used when +\fB$SHLIBVERSION\fR +is set\&. +.RE +.PP SHLINK .RS 4 The linker for programs that use shared libraries\&. @@ -15767,6 +15840,8 @@ .PP TARGET_ARCH .RS 4 +The name of the target hardware architecture for the compiled objects created by this Environment\&. This defaults to the value of HOST_ARCH, and the user can override it\&. Currently only set for Win32\&. +.sp Sets the target architecture for Visual Studio compiler (i\&.e\&. the arch of the binaries generated by the compiler)\&. If not set, default to \fB$HOST_ARCH\fR, or, if that is unset, to the architecture of the running machine\*(Aqs OS (note that the python build or architecture has no effect)\&. This variable must be passed as an argument to the Environment() constructor; setting it later has no effect\&. This is currently only used on Windows, but in the future it will be used on other OSes as well\&. .sp @@ -15782,8 +15857,6 @@ (Itanium)\&. For example, if you want to compile 64\-bit binaries, you would set TARGET_ARCH=\*(Aqx86_64\*(Aq in your SCons environment\&. -.sp -The name of the target hardware architecture for the compiled objects created by this Environment\&. This defaults to the value of HOST_ARCH, and the user can override it\&. Currently only set for Win32\&. .RE .PP TARGET_OS @@ -17310,7 +17383,9 @@ \fIsort\fR function should take two arguments and return \-1, 0 or 1 (like the standard Python \fIcmp\fR -function)\&. +function)\&. Optionally a Boolean value of True for +\fIsort\fR +will cause a standard alphabetical sort to be performed .sp .if n \{\ .RS 4 diff -Nru scons-3.0.0/sconsign.1 scons-3.0.1/sconsign.1 --- scons-3.0.0/sconsign.1 2017-09-18 20:00:09.000000000 +0000 +++ scons-3.0.1/sconsign.1 2017-11-14 21:18:26.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: SCONSIGN .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 09/18/2017 -.\" Manual: SCons 3.0.0 -.\" Source: SCons 3.0.0 +.\" Date: 11/14/2017 +.\" Manual: SCons 3.0.1 +.\" Source: SCons 3.0.1 .\" Language: English .\" -.TH "SCONSIGN" "1" "09/18/2017" "SCons 3\&.0\&.0" "SCons 3\&.0\&.0" +.TH "SCONSIGN" "1" "11/14/2017" "SCons 3\&.0\&.1" "SCons 3\&.0\&.1" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru scons-3.0.0/scons-time.1 scons-3.0.1/scons-time.1 --- scons-3.0.0/scons-time.1 2017-09-18 20:00:09.000000000 +0000 +++ scons-3.0.1/scons-time.1 2017-11-14 21:18:26.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: SCONS-TIME .\" Author: [see the "AUTHORS" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 09/18/2017 -.\" Manual: SCons 3.0.0 -.\" Source: SCons 3.0.0 +.\" Date: 11/14/2017 +.\" Manual: SCons 3.0.1 +.\" Source: SCons 3.0.1 .\" Language: English .\" -.TH "SCONS\-TIME" "1" "09/18/2017" "SCons 3\&.0\&.0" "SCons 3\&.0\&.0" +.TH "SCONS\-TIME" "1" "11/14/2017" "SCons 3\&.0\&.1" "SCons 3\&.0\&.1" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru scons-3.0.0/script/scons scons-3.0.1/script/scons --- scons-3.0.0/script/scons 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/script/scons 2017-11-14 21:16:58.000000000 +0000 @@ -25,15 +25,15 @@ from __future__ import print_function -__revision__ = "src/script/scons.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/script/scons.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" -__version__ = "3.0.0" +__version__ = "3.0.1" -__build__ = "rel_3.0.0:4395:8972f6a2f699" +__build__ = "74b2c53bc42290e911b334a6b44f187da698a668" -__buildsys__ = "ubuntu-16" +__buildsys__ = "hpmicrodog" -__date__ = "2017/09/18 12:59:24" +__date__ = "2017/11/14 13:16:53" __developer__ = "bdbaddog" @@ -65,7 +65,7 @@ sys.exit(1) -script_dir = sys.path[0] +script_dir = os.path.dirname(os.path.realpath(__file__)) if script_dir in sys.path: sys.path.remove(script_dir) diff -Nru scons-3.0.0/script/scons.bat scons-3.0.1/script/scons.bat --- scons-3.0.0/script/scons.bat 2017-09-18 20:00:09.000000000 +0000 +++ scons-3.0.1/script/scons.bat 2017-11-14 21:18:26.000000000 +0000 @@ -1,11 +1,11 @@ @REM Copyright (c) 2001 - 2017 The SCons Foundation -@REM src/script/scons.bat rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog +@REM src/script/scons.bat 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog @echo off set SCONS_ERRORLEVEL= if "%OS%" == "Windows_NT" goto WinNT @REM for 9x/Me you better not have more than 9 args -python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-3.0.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.0.0'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9 +python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-3.0.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.0.1'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9 @REM no way to set exit status of this script for 9x/Me goto endscons diff -Nru scons-3.0.0/script/scons-configure-cache scons-3.0.1/script/scons-configure-cache --- scons-3.0.0/script/scons-configure-cache 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/script/scons-configure-cache 2017-11-14 21:16:58.000000000 +0000 @@ -25,15 +25,15 @@ from __future__ import print_function -__revision__ = "src/script/scons-configure-cache.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/script/scons-configure-cache.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" -__version__ = "3.0.0" +__version__ = "3.0.1" -__build__ = "rel_3.0.0:4395:8972f6a2f699" +__build__ = "74b2c53bc42290e911b334a6b44f187da698a668" -__buildsys__ = "ubuntu-16" +__buildsys__ = "hpmicrodog" -__date__ = "2017/09/18 12:59:24" +__date__ = "2017/11/14 13:16:53" __developer__ = "bdbaddog" diff -Nru scons-3.0.0/script/sconsign scons-3.0.1/script/sconsign --- scons-3.0.0/script/sconsign 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/script/sconsign 2017-11-14 21:16:58.000000000 +0000 @@ -25,15 +25,15 @@ from __future__ import print_function -__revision__ = "src/script/sconsign.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/script/sconsign.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" -__version__ = "3.0.0" +__version__ = "3.0.1" -__build__ = "rel_3.0.0:4395:8972f6a2f699" +__build__ = "74b2c53bc42290e911b334a6b44f187da698a668" -__buildsys__ = "ubuntu-16" +__buildsys__ = "hpmicrodog" -__date__ = "2017/09/18 12:59:24" +__date__ = "2017/11/14 13:16:53" __developer__ = "bdbaddog" @@ -57,7 +57,7 @@ # engine modules if they're in either directory. -script_dir = sys.path[0] +script_dir = os.path.dirname(os.path.realpath(__file__)) if script_dir in sys.path: sys.path.remove(script_dir) diff -Nru scons-3.0.0/script/scons-time scons-3.0.1/script/scons-time --- scons-3.0.0/script/scons-time 2017-09-18 19:59:28.000000000 +0000 +++ scons-3.0.1/script/scons-time 2017-11-14 21:16:58.000000000 +0000 @@ -31,7 +31,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import division, print_function -__revision__ = "src/script/scons-time.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/script/scons-time.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import getopt import glob diff -Nru scons-3.0.0/setup.py scons-3.0.1/setup.py --- scons-3.0.0/setup.py 2017-09-18 20:00:09.000000000 +0000 +++ scons-3.0.1/setup.py 2017-11-14 21:18:26.000000000 +0000 @@ -34,13 +34,13 @@ from __future__ import print_function -__revision__ = "src/setup.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog" +__revision__ = "src/setup.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" import os import stat import sys -Version = "3.0.0" +Version = "3.0.1" man_pages = [ 'scons.1', @@ -76,16 +76,6 @@ import distutils.msvccompiler -def get_build_version(): - """ monkey patch distutils msvc version if we're not on windows. - We need to use vc version 9 for python 2.7.x and it defaults to 6 - for non-windows platforms and there is no way to override it besides - monkey patching""" - return 9 - - -distutils.msvccompiler.get_build_version = get_build_version - _install = distutils.command.install.install _install_data = distutils.command.install_data.install_data _install_lib = distutils.command.install_lib.install_lib