diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-11-03 20:25:46 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-11-03 20:25:46 (GMT) |
| commit | 9d637bc1d28420698f4a9345b7579d09cc8c311f (patch) | |
| tree | 3e897bf42bd4135798be76f2ea31084e2e69fd99 | |
| parent | 5587089a661a520a32c353ea886939cd63a0636a (diff) | |
| download | SCons-9d637bc1d28420698f4a9345b7579d09cc8c311f.zip SCons-9d637bc1d28420698f4a9345b7579d09cc8c311f.tar.gz SCons-9d637bc1d28420698f4a9345b7579d09cc8c311f.tar.bz2 | |
manually merge packaging updates from 2.5.1
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | src/script/MANIFEST.in | 1 | ||||
| -rw-r--r-- | src/setup.py | 1 |
3 files changed, 7 insertions, 3 deletions
@@ -8,7 +8,7 @@ from __future__ import print_function 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__ @@ -45,7 +45,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() @@ -646,6 +646,7 @@ scons_script = { 'scons' : 'scons.py', 'sconsign' : 'sconsign.py', 'scons-time' : 'scons-time.py', + 'scons-configure-cache' : 'scons-configure-cache.py', }, 'buildermap' : {}, @@ -654,6 +655,7 @@ scons_script = { 'scons-' + version, 'sconsign-' + version, 'scons-time-' + version, + 'scons-configure-cache-' + version, ], 'explicit_deps' : { @@ -710,7 +712,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 f324ed4..d10cc82 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 9a02b25..41fc35a 100644 --- a/src/setup.py +++ b/src/setup.py @@ -388,6 +388,7 @@ scripts = [ 'script/scons', 'script/sconsign', 'script/scons-time', + '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, |