Merge tag 'upstream/2.5.1+repack'

Upstream version 2.5.1+repack

6 files changed, 19 insertions, 18 deletions

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/script/scons-configure-cache.py b/src/script/scons-configure-cache.py
index dba42db..a376b2d 100644
--- a/src/script/scons-configure-cache.py
+++ b/src/script/scons-configure-cache.py
@@ -23,15 +23,15 @@
 # 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/script/scons-configure-cache.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"

+__revision__ = "src/script/scons-configure-cache.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"

 

-__version__ = "2.5.0"

+__version__ = "2.5.1"

 

-__build__ = "rel_2.5.0:3543:937e55cd78f7[MODIFIED]"

+__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]"

 

-__buildsys__ = "ubuntu1404-32bit"

+__buildsys__ = "mongodog"

 

-__date__ = "2016/04/09 11:29:54"

+__date__ = "2016/11/03 14:02:02"

 

 __developer__ = "bdbaddog"

 

diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 2e63ef2..3438062 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import nested_scopes
 
-__revision__ = "src/script/scons-time.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
+__revision__ = "src/script/scons-time.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
 
 import getopt
 import glob
diff --git a/src/script/scons.bat b/src/script/scons.bat
index 01acf5d..7a7690e 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
 @REM Copyright (c) 2001 - 2016 The SCons Foundation

-@REM src/script/scons.bat rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog

+@REM src/script/scons.bat rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 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-2.5.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.5.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-2.5.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.5.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 --git a/src/script/scons.py b/src/script/scons.py
index 0d63352..967d398 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -23,15 +23,15 @@
 # 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/script/scons.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
+__revision__ = "src/script/scons.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
 
-__version__ = "2.5.0"
+__version__ = "2.5.1"
 
-__build__ = "rel_2.5.0:3543:937e55cd78f7[MODIFIED]"
+__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]"
 
-__buildsys__ = "ubuntu1404-32bit"
+__buildsys__ = "mongodog"
 
-__date__ = "2016/04/09 11:29:54"
+__date__ = "2016/11/03 14:02:02"
 
 __developer__ = "bdbaddog"
 
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 4485eb8..90572c3 100644
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -23,15 +23,15 @@
 # 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/script/sconsign.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
+__revision__ = "src/script/sconsign.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
 
-__version__ = "2.5.0"
+__version__ = "2.5.1"
 
-__build__ = "rel_2.5.0:3543:937e55cd78f7[MODIFIED]"
+__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]"
 
-__buildsys__ = "ubuntu1404-32bit"
+__buildsys__ = "mongodog"
 
-__date__ = "2016/04/09 11:29:54"
+__date__ = "2016/11/03 14:02:02"
 
 __developer__ = "bdbaddog"