From cd2ab5002aa2359575088bbc3183a9a91cc50c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 14:37:42 +0100 Subject: New upstream version 3.0.1 --- script/scons | 12 ++++++------ script/scons-configure-cache | 10 +++++----- script/scons-time | 2 +- script/scons.bat | 4 ++-- script/sconsign | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'script') diff --git a/script/scons b/script/scons index bee0224..fe9d724 100644 --- a/script/scons +++ b/script/scons @@ -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 @@ Python < 3.5 is not yet supported.\n" 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 --git a/script/scons-configure-cache b/script/scons-configure-cache index 9b8b737..cbb058d 100644 --- a/script/scons-configure-cache +++ b/script/scons-configure-cache @@ -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 --git a/script/scons-time b/script/scons-time index 08bde60..3fdb8f2 100644 --- a/script/scons-time +++ b/script/scons-time @@ -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 --git a/script/scons.bat b/script/scons.bat index f759e43..4d0e6e6 100644 --- a/script/scons.bat +++ b/script/scons.bat @@ -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 --git a/script/sconsign b/script/sconsign index d3450ab..7391807 100644 --- a/script/sconsign +++ b/script/sconsign @@ -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 @@ import sys # 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) -- cgit v1.2.3