From 4c342e936910a2dba3d3a847941abe699b40b5e4 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 14:42:33 -0400 Subject: Regenerated docs for 2.5.0-1 release --- doc/generated/examples/caching_ex-random_1.xml | 6 +++--- doc/generated/examples/tasks_ex1_1.xml | 2 +- doc/generated/examples/troubleshoot_Dump_1.xml | 6 +----- doc/generated/examples/troubleshoot_Dump_2.xml | 6 +----- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/examples/troubleshoot_stacktrace_2.xml | 4 ++-- doc/generated/variables.gen | 16 ++++++++-------- doc/generated/variables.mod | 4 ++-- 8 files changed, 19 insertions(+), 27 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index cb142590..24c43ad5 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f1.o -c f1.c -cc -o f4.o -c f4.c cc -o f5.o -c f5.c -cc -o f3.o -c f3.c +cc -o f4.o -c f4.c cc -o f2.o -c f2.c +cc -o f1.o -c f1.c +cc -o f3.o -c f3.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml index 4885fde2..5760a453 100644 --- a/doc/generated/examples/tasks_ex1_1.xml +++ b/doc/generated/examples/tasks_ex1_1.xml @@ -1,7 +1,7 @@ % scons -Q -cat < test.bar > test.h cc -o app main.cpp cat < foo.bar2 > foo.cpp cc -o app2 main2.cpp foo.cpp +cat < test.bar > test.h diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml index 99d1399e..248e85c0 100644 --- a/doc/generated/examples/troubleshoot_Dump_1.xml +++ b/doc/generated/examples/troubleshoot_Dump_1.xml @@ -47,7 +47,7 @@ scons: Reading SConscript files ... 'PROGSUFFIX': '', 'PSPAWN': <function piped_env_spawn at 0x700000&gt;, 'RDirs': <SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;, - 'SCANNERS': [<SCons.Scanner.Base object at 0x700000&gt;], + 'SCANNERS': [], 'SHELL': 'sh', 'SHLIBPREFIX': '$LIBPREFIX', 'SHLIBSUFFIX': '.so', @@ -64,11 +64,7 @@ scons: Reading SConscript files ... '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)', '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}', '__DRPATH': '$_DRPATH', - '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}', - '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}', '__RPATH': '$_RPATH', - '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}', - '__libversionflags': <function __libversionflags at 0x700000&gt;, '_concat': <function _concat at 0x700000&gt;, '_defines': <function _defines at 0x700000&gt;, '_stripixes': <function _stripixes at 0x700000&gt;} diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index a6214223..d6fa4041 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -71,7 +71,7 @@ scons: Reading SConscript files ... 'RCFLAGS': [], 'RCSUFFIXES': ['.rc', '.rc2'], 'RDirs': <SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;, - 'SCANNERS': [<SCons.Scanner.Base object at 0x700000&gt;], + 'SCANNERS': [], 'SHCC': '$CC', 'SHCCCOM': <SCons.Action.FunctionAction object at 0x700000&gt;, 'SHCCFLAGS': ['$CCFLAGS'], @@ -97,10 +97,6 @@ scons: Reading SConscript files ... '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)', '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}', '_MSVC_OUTPUT_FLAG': <function msvc_output_flag at 0x700000&gt;, - '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}', - '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}', - '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}', - '__libversionflags': <function __libversionflags at 0x700000&gt;, '_concat': <function _concat at 0x700000&gt;, '_defines': <function _defines at 0x700000&gt;, '_stripixes': <function _stripixes at 0x700000&gt;} diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 7e495ea2..cc7ee2aa 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -3,5 +3,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/home/ghost/projects/scons/bootstrap/src/script/scons.py", line 199, in <module> +File "/home/bdbaddog/devel/scons/bootstrap/src/script/scons.py", line 199, in <module> diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index 1de0dcf3..1ab65ee3 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -4,10 +4,10 @@ scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: File "bootstrap/src/engine/SCons/Job.py", line 199, in start task.prepare() - File "bootstrap/src/engine/SCons/Script/Main.py", line 164, in prepare + File "bootstrap/src/engine/SCons/Script/Main.py", line 173, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) File "bootstrap/src/engine/SCons/Taskmaster.py", line 191, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 427, in prepare + File "bootstrap/src/engine/SCons/Executor.py", line 396, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index b64eb5ac..064ddef1 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -968,19 +968,19 @@ DFLAGPREFIX. - - _DFLAGS + + DFLAGS -_DFLAGS. +DFLAGS. - - DFLAGS + + _DFLAGS -DFLAGS. +_DFLAGS. @@ -3104,7 +3104,7 @@ The command line used to call the Java archive tool. The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -3114,7 +3114,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 955a9eb8..b8815f5d 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$_DFLAGS"> $DFLAGS"> +$_DFLAGS"> $DFLAGSUFFIX"> $_DINCFLAGS"> $DINCPREFIX"> @@ -732,8 +732,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$_DFLAGS"> $DFLAGS"> +$_DFLAGS"> $DFLAGSUFFIX"> $_DINCFLAGS"> $DINCPREFIX"> -- cgit v1.2.1 From b7d53a2e187185f9becc1100f0e3ba90a194dbc3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 16:45:07 -0400 Subject: update debian file --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9d60e3af..df47e95c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +scons (2.5.0-1) unstable; urgency=low + + * Maintenance release. + + -- William Deegan Sat, 07 Nov 2015 08:56:00 -0700 + scons (2.4.1) unstable; urgency=low * Maintenance release. -- cgit v1.2.1 From b5713ba4a94c9aa83da84a47210650f2c281f44c Mon Sep 17 00:00:00 2001 From: Alexey Klimkin Date: Thu, 26 May 2016 11:03:00 -0700 Subject: Optimize implicit dependency scan When calculating path, performance spent on two things: - Variable expansion, if CPPPATH contains any variables - CPPPATH flattening Use memoization to optimize PATH evaluation across all dependencies per node. --- src/engine/SCons/Node/__init__.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index 86a5c1d9..d3fc9eb5 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -924,9 +924,9 @@ class Node(object): scanner's recursive flag says that we should. """ nodes = [self] - seen = {} - seen[self] = 1 + seen = set(nodes) dependencies = [] + path_memo = {} root_node_scanner = self._get_scanner(env, initial_scanner, None, kw) @@ -934,31 +934,33 @@ class Node(object): node = nodes.pop(0) scanner = node._get_scanner(env, initial_scanner, root_node_scanner, kw) - if not scanner: continue - path = path_func(scanner) + try: + path = path_memo[scanner] + except KeyError: + path = path_func(scanner) + path_memo[scanner] = path included_deps = [x for x in node.get_found_includes(env, scanner, path) if x not in seen] if included_deps: dependencies.extend(included_deps) - for dep in included_deps: - seen[dep] = 1 + seen.update(included_deps) nodes.extend(scanner.recurse_nodes(included_deps)) return dependencies def _get_scanner(self, env, initial_scanner, root_node_scanner, kw): - if not initial_scanner: + if initial_scanner: + # handle explicit scanner case + scanner = initial_scanner.select(self) + else: # handle implicit scanner case scanner = self.get_env_scanner(env, kw) if scanner: scanner = scanner.select(self) - else: - # handle explicit scanner case - scanner = initial_scanner.select(self) - + if not scanner: # no scanner could be found for the given node's scanner key; # thus, make an attempt at using a default. -- cgit v1.2.1 From 69a766703f921f1e9d796047907fcd1ad67720e9 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 10:53:41 -0700 Subject: added scons-configure-cache.py to packaging scripts --- src/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup.py b/src/setup.py index 91b7752d..947adcd1 100644 --- a/src/setup.py +++ b/src/setup.py @@ -394,6 +394,7 @@ scripts = [ 'script/scons', 'script/sconsign', 'script/scons-time', + 'script/scons-configure-cache.py', # We include scons.bat in the list of scripts, even on UNIX systems, # because we provide an option to allow it be installed explicitly, -- cgit v1.2.1 -- cgit v1.2.1 From 376d81f52fafbe0db8f1c3f8fb091d2ede89b4ac Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 17:20:36 -0400 Subject: Updates to src/CHANGES.txt for 2.5.1 --- src/CHANGES.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3d2cf1c3..0615130b 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,16 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER + From William Deegan: + - Add scons-configure-cache.py to packaging. It was omitted + + From Alexey Klimkin: + - Use memoization to optimize PATH evaluation across all dependencies per + node. (PR #345) + + +RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 + From Tom Tanner: - change cache to use 2 character subdirectories, rather than one character, so as not to give huge directories for large caches, a situation which -- cgit v1.2.1 -- cgit v1.2.1 From 40171879ce368f8722284c4014304ad69edf0e00 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 17:23:27 -0400 Subject: Regenerated docs for 2.5.1 Release --- ReleaseConfig | 4 ++-- doc/generated/examples/caching_ex-random_1.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index e1f462ac..cf815c5f 100644 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" # 'final', the patchlevel is set to the release date. This value is # mandatory and must be present in this file. #version_tuple = (2, 2, 0, 'final', 0) -version_tuple = (2, 4, 2, 'alpha', 0) +version_tuple = (2, 5, 1) # Python versions prior to unsupported_python_version cause a fatal error # when that version is used. Python versions prior to deprecate_python_version @@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0) #month_year = 'December 2012' # If copyright years is not given, the release year is used as the end. -copyright_years = '2001 - 2015' +copyright_years = '2001 - 2016' # Local Variables: # tab-width:4 diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 24c43ad5..6decbd33 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q +cc -o f3.o -c f3.c cc -o f5.o -c f5.c cc -o f4.o -c f4.c -cc -o f2.o -c f2.c cc -o f1.o -c f1.c -cc -o f3.o -c f3.c +cc -o f2.o -c f2.c cc -o prog f1.o f2.o f3.o f4.o f5.o -- cgit v1.2.1 From d98425f508718e618dd47d0b7ed568fc5bd0556a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 19 Oct 2016 18:24:27 -0400 Subject: fix merge issue with CHANGES.txt --- src/CHANGES.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index fd34d355..5aa1eee1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -16,16 +16,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 - From Tom Tanner: - - change cache to use 2 character subdirectories, rather than one character, - so as not to give huge directories for large caches, a situation which - causes issues for NFS. - For existing caches, you will need to run the scons-configure-cache.py - script to update them to the new format. You will get a warning every time - you build until you co this. - - Fix a bunch of unit tests on windows - - From Dirk Baechle: - Removed a lot of compatibility methods and workarounds for Python versions < 2.7, in order to prepare the work -- cgit v1.2.1 -- cgit v1.2.1 From d861a4b7688acbf248d385bf7163cbbbebadb7dd Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 3 Nov 2016 13:29:08 -0400 Subject: Regenerated docs for 2.5.1 release. --- doc/generated/examples/caching_ex-random_1.xml | 4 +-- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- .../examples/troubleshoot_stacktrace_2.xml | 2 +- doc/generated/tools.gen | 12 ++++---- doc/generated/tools.mod | 4 +-- doc/generated/variables.gen | 36 +++++++++++----------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 232e96fc..01d92e62 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f4.o -c f4.c -cc -o f2.o -c f2.c cc -o f1.o -c f1.c cc -o f5.o -c f5.c cc -o f3.o -c f3.c +cc -o f2.o -c f2.c +cc -o f4.o -c f4.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 3d8592d4..cc7ee2aa 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -3,5 +3,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/scons/as_scons/bootstrap/src/script/scons.py", line 199, in <module> +File "/home/bdbaddog/devel/scons/bootstrap/src/script/scons.py", line 199, in <module> diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index add59ff4..1ab65ee3 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -8,6 +8,6 @@ scons: internal stack trace: return SCons.Taskmaster.OutOfDateTask.prepare(self) File "bootstrap/src/engine/SCons/Taskmaster.py", line 191, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare + File "bootstrap/src/engine/SCons/Executor.py", line 396, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index ba12966f..fcb75877 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -780,19 +780,19 @@ Sets construction variables for the Sets: &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.Uses: &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;. - - Packaging + + packaging -Sets construction variables for the Package Builder. +A framework for building binary and source packages. - - packaging + + Packaging -A framework for building binary and source packages. +Sets construction variables for the Package Builder. diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod index 2ee22706..1191e6a3 100644 --- a/doc/generated/tools.mod +++ b/doc/generated/tools.mod @@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. mwcc"> mwld"> nasm"> -Packaging"> packaging"> +Packaging"> pdf"> pdflatex"> pdftex"> @@ -189,8 +189,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. mwcc"> mwld"> nasm"> -Packaging"> packaging"> +Packaging"> pdf"> pdflatex"> pdftex"> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index a155d75f..064ddef1 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -2837,15 +2837,6 @@ is -dNOPAUSE -dBATCH -sDEVICE=pdfwrite HOST_ARCH - - The name of the host hardware architecture used to create the Environment. - If a platform is specified when creating the Environment, then - that Platform's 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. - - Sets the host architecture for Visual Studio compiler. If not set, default to the detected host architecture: note that this may depend @@ -2862,7 +2853,16 @@ Valid values are the same as for This is currently only used on Windows, but in the future it will be used on other OSes as well. - + + + The name of the host hardware architecture used to create the Environment. + If a platform is specified when creating the Environment, then + that Platform's 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. + + HOST_OS @@ -7037,13 +7037,6 @@ that may not be set or used in a construction environment. TARGET_ARCH - - 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. - - Sets the target architecture for Visual Studio compiler (i.e. the arch of the binaries generated by the compiler). If not set, default to @@ -7069,7 +7062,14 @@ and ia64 (Itanium). For example, if you want to compile 64-bit binaries, you would set TARGET_ARCH='x86_64' in your SCons environment. - + + + 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. + + TARGET_OS -- cgit v1.2.1 From e110130031d3cd63eeda6aa76e9494ca3f5a8aac Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 3 Nov 2016 13:37:18 -0400 Subject: updates to Announce.txt and RELEASE.txt with info updates/changes --- debian/changelog | 2 +- src/RELEASE.txt | 53 ++++++++++++----------------------------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7cc42fa6..3bce287a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (2.5.0-1) unstable; urgency=low +scons (2.5.1) unstable; urgency=low * Maintenance release. diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 32d5a085..10600857 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,38 +1,15 @@ - A new SCons checkpoint release, 2.5.0, is now available + A new SCons checkpoint release, 2.5.1, is now available on the SCons download page: http://www.scons.org/download.php - XXX The primary purpose of this release ... XXX + This is a minor release - Here is a summary of the changes since 2.4.1: + Here is a summary of the changes since 2.5.0: NEW FUNCTIONALITY - - We're enhancing implicit language scanning functionality to improve - correctness. SCons now honors scanner keys for implicit dependencies - and correctly changes scanner type (if necessary) when traversing - implicit dependency trees. - - This enhancement resolves missing dependencies - with built-in scanners including SWIG (#2264) and QT: - * http://scons.tigris.org/issues/show_bug.cgi?id=2264 - - - This enhancement broadens the horizon for handling heterogeneous - data flow environments (E.G. software builds): - - http://article.gmane.org/gmane.comp.programming.tools.scons.user/26596 - - - SCons may find new (and correct) dependencies in cross-langauge contexts. - - Update may cause rebuilds, especially in heterogeneous data environments. - - Update may find previously missed dependencies errors (E.G. cycles). - - Discovered in some QT test cases. - - SCons handles the SCANNERS variable differently. - - Previously, the Install builder would scan implicit dependencies for - a scanner found in SCANNERS (but not for built-in scanners), but now - the Install builder will not scan recursively regardless in order - to optimize Install behaviour and bring orthogonality to previous behaviour. - - - New external tool scons-configurecache which allows some configuration of - how files in the cache are controlled. + + - None DEPRECATED FUNCTIONALITY @@ -40,26 +17,21 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY - - SCons handles cache directories a bit differently/ - - Cache files are now stored in 256 subdirectories in the cache directory by - default (this stresses NFS less). Existing cache directories will remain as - current, but SCons will prompt you to run scons-configure-cache which will - allow you to migrate to the new layout, or confirm you want to use the - existing layout. + - None FIXES - - This enhancement resolves missing dependencies with built-in scanners including - SWIG (#2264) and QT - See New Features above - * http://scons.tigris.org/issues/show_bug.cgi?id=2264 + - None IMPROVEMENTS - - None + - Use memoization to optimize PATH evaluation across all dependencies per + node. (PR #345) This should fix some performance degredation due to + changes to enable enhanced multi-language scanning added in 2.5.0 PACKAGING - - None + - Fixed missing scons-configure-cache.py. (It was accidently omitted) DOCUMENTATION @@ -69,8 +41,7 @@ - None - Thanks to Dirk Baechle, William Blevins, William Deegan, Jakub Pola, Adarsh Sanjeev, Tom Tanner - for their contributions to this release. + Thanks to William Deegan and Alexey Klimkin for their contributions to this release. Contributors are listed alphabetically by their last name. __COPYRIGHT__ -- cgit v1.2.1 From 69e9a3d5093c02f1036af21734cd8657cb337b21 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 3 Nov 2016 14:13:33 -0400 Subject: Packaging fixes to make sure scons-configure-cache is in package. (Needs to be merged to default branch as well) --- SConstruct | 8 +++++--- src/script/MANIFEST.in | 1 + src/setup.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 33a8680a..abc12152 100644 --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ copyright_years = '2001 - 2016' # This gets inserted into the man pages to reflect the month of release. -month_year = 'April 2016' +month_year = 'November 2016' # # __COPYRIGHT__ @@ -43,7 +43,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.5.0' +default_version = '2.5.1' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() @@ -642,6 +642,7 @@ scons_script = { 'scons' : 'scons.py', 'sconsign' : 'sconsign.py', 'scons-time' : 'scons-time.py', + 'scons-configure-cache' : 'scons-configure-cache.py', }, 'buildermap' : {}, @@ -650,6 +651,7 @@ scons_script = { 'scons-' + version, 'sconsign-' + version, 'scons-time-' + version, + 'scons-configure-cache-' + version, ], 'explicit_deps' : { @@ -706,7 +708,7 @@ scons = { }, } -scripts = ['scons', 'sconsign', 'scons-time'] +scripts = ['scons', 'sconsign', 'scons-time', 'scons-configure-cache'] src_deps = [] src_files = [] diff --git a/src/script/MANIFEST.in b/src/script/MANIFEST.in index f324ed45..d10cc827 100644 --- a/src/script/MANIFEST.in +++ b/src/script/MANIFEST.in @@ -1,3 +1,4 @@ scons sconsign scons-time +scons-configure-cache diff --git a/src/setup.py b/src/setup.py index 947adcd1..dcce3616 100644 --- a/src/setup.py +++ b/src/setup.py @@ -394,7 +394,7 @@ scripts = [ 'script/scons', 'script/sconsign', 'script/scons-time', - 'script/scons-configure-cache.py', + 'script/scons-configure-cache', # We include scons.bat in the list of scripts, even on UNIX systems, # because we provide an option to allow it be installed explicitly, -- cgit v1.2.1 From 8401dfba45a1c08c57f6a85e69abdf69e594c51a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 3 Nov 2016 15:22:43 -0400 Subject: versions updated to 2.5.1 --- QMTest/TestSCons.py | 2 +- README.rst | 38 +++++++++++++++++++------------------- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index b71ee626..bf0c3701 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.5.0' +default_version = '2.5.1' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index ba1755fd..ca1b081e 100644 --- a/README.rst +++ b/README.rst @@ -168,7 +168,7 @@ Or on Windows:: By default, the above commands will do the following: -- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in +- Install the version-numbered "scons-2.5.1" and "sconsign-2.5.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 line. @@ -180,23 +180,23 @@ By default, the above commands will do the following: before 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-2.5.0" and "sconsign-2.5.0" + hard links or symbolic links to the "scons-2.5.1" and "sconsign-2.5.1" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. -- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python +- Install "scons-2.5.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-2.5.0.bat" and "scons.bat" files installed in the default system + have "scons-2.5.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 Windows systems. - Install the SCons build engine (a Python module) in an appropriate - version-numbered SCons library directory (/usr/lib/scons-2.5.0 or - C:\\Python\*\\scons-2.5.0, for example). See below for more options related to + version-numbered SCons library directory (/usr/lib/scons-2.5.1 or + C:\\Python\*\\scons-2.5.1, 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 @@ -474,7 +474,7 @@ running all of "runtest.py -a". Building Packages ================= -We use SCons (version 2.5.0 or later) to build its own packages. If you +We use SCons (version 2.5.1 or later) to build its own packages. If you already have an appropriate version of SCons installed on your system, you can build everything by simply running it:: @@ -489,18 +489,18 @@ about `Executing SCons Without Installing`_):: Depending on the utilities installed on your system, any or all of the following packages will be built:: - build/dist/scons-2.5.0-1.noarch.rpm - build/dist/scons-2.5.0-1.src.rpm - build/dist/scons-2.5.0.linux-i686.tar.gz - build/dist/scons-2.5.0.tar.gz - build/dist/scons-2.5.0.win32.exe - build/dist/scons-2.5.0.zip - build/dist/scons-doc-2.5.0.tar.gz - build/dist/scons-local-2.5.0.tar.gz - build/dist/scons-local-2.5.0.zip - build/dist/scons-src-2.5.0.tar.gz - build/dist/scons-src-2.5.0.zip - build/dist/scons_2.5.0-1_all.deb + build/dist/scons-2.5.1-1.noarch.rpm + build/dist/scons-2.5.1-1.src.rpm + build/dist/scons-2.5.1.linux-i686.tar.gz + build/dist/scons-2.5.1.tar.gz + build/dist/scons-2.5.1.win32.exe + build/dist/scons-2.5.1.zip + build/dist/scons-doc-2.5.1.tar.gz + build/dist/scons-local-2.5.1.tar.gz + build/dist/scons-local-2.5.1.zip + build/dist/scons-src-2.5.1.tar.gz + build/dist/scons-src-2.5.1.zip + build/dist/scons_2.5.1-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build packages for which you don't have the proper utilities installed. For diff --git a/src/Announce.txt b/src/Announce.txt index b16fb3be..c57ba6f0 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more effectively, please go to http://scons.org/lists.php#users to sign up for the scons-users mailing list. -RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 +RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400 Please consult the RELEASE.txt file for a summary of changes since the last release and consult the CHANGES.txt file for complete a list of changes diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 5aa1eee1..7390f071 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,7 +4,7 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400 From William Deegan: - Add scons-configure-cache.py to packaging. It was omitted -- cgit v1.2.1 -- cgit v1.2.1 -- cgit v1.2.1 From 8018ed8b59876d27d883e6a5fc013a7d5d198945 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 21 Apr 2017 16:32:13 -0700 Subject: kick buildbot --- SConstruct | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SConstruct b/SConstruct index abc12152..a35fee4f 100644 --- a/SConstruct +++ b/SConstruct @@ -1384,3 +1384,5 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'QMTest'), os.path.join(build_dir, 'runtest.py'), ]) + +# test -- cgit v1.2.1 From 53154eacea3940b9a97241d6d4e2ae0cfbb0bcb8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 21 Apr 2017 16:44:04 -0700 Subject: kick buildbot --- SConstruct | 1 - 1 file changed, 1 deletion(-) diff --git a/SConstruct b/SConstruct index a35fee4f..5e4e63a5 100644 --- a/SConstruct +++ b/SConstruct @@ -1385,4 +1385,3 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'runtest.py'), ]) -# test -- cgit v1.2.1 From f4bcd5969c7a1c2adcffb17426baaa9a8d1091f0 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 21 Apr 2017 16:58:25 -0700 Subject: kick buildbot --- SConstruct | 1 + 1 file changed, 1 insertion(+) diff --git a/SConstruct b/SConstruct index 5e4e63a5..ba7fe6fa 100644 --- a/SConstruct +++ b/SConstruct @@ -1385,3 +1385,4 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'runtest.py'), ]) +# -- cgit v1.2.1 From 9c1ce76434965b3bfa57e3e5a6efbb72cbe45af8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 24 Apr 2017 21:44:00 -0700 Subject: test bb webhooks --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index ba7fe6fa..1478b61a 100644 --- a/SConstruct +++ b/SConstruct @@ -1385,4 +1385,4 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'runtest.py'), ]) -# +# Blank -- cgit v1.2.1 From d5c4d4296da576a826466382589da86966a70954 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 25 Apr 2017 08:02:17 -0700 Subject: test bb webhooks --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 1478b61a..e863c9e6 100644 --- a/SConstruct +++ b/SConstruct @@ -1385,4 +1385,4 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'runtest.py'), ]) -# Blank +# -- cgit v1.2.1 From c2c022668361dca8afb0b045286c310211bfa366 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 25 Apr 2017 10:50:59 -0700 Subject: test --- SConstruct | 1 - 1 file changed, 1 deletion(-) diff --git a/SConstruct b/SConstruct index e863c9e6..5e4e63a5 100644 --- a/SConstruct +++ b/SConstruct @@ -1385,4 +1385,3 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'runtest.py'), ]) -# -- cgit v1.2.1 From 43b373b475830f4ece409b073c4f27c51b643cee Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 25 Apr 2017 11:03:53 -0700 Subject: test --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 5e4e63a5..d793e933 100644 --- a/SConstruct +++ b/SConstruct @@ -1384,4 +1384,4 @@ for pf, help_text in packaging_flavors: os.path.join(build_dir, 'QMTest'), os.path.join(build_dir, 'runtest.py'), ]) - +# -- cgit v1.2.1