summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 06:58:30 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 06:58:30 +0100
commitdcffe49265eb5d1255b96fcbdba58a50db879fee (patch)
tree498cf4db1a14292430c9fc19a572419b1dac866d /src/script
parent8f2056eedecb0c2a7d794b78343d82cae50ffc38 (diff)
parente20c9557371eacec533588d33b4bebd543ba178f (diff)
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
Diffstat (limited to 'src/script')
-rw-r--r--src/script/scons-time.py2
-rw-r--r--src/script/scons.bat4
-rw-r--r--src/script/scons.py10
-rw-r--r--src/script/sconsign.py10
4 files changed, 13 insertions, 13 deletions
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index f37d906..054e73e 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.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
+__revision__ = "src/script/scons-time.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
import getopt
import glob
diff --git a/src/script/scons.bat b/src/script/scons.bat
index bda2baa..563ab59 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
@REM Copyright (c) 2001 - 2015 The SCons Foundation
-@REM src/script/scons.bat rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog
+@REM src/script/scons.bat rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 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.4.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.4.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.4.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.4.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 0e59647..e2f66bd 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.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
+__revision__ = "src/script/scons.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
-__version__ = "2.4.0"
+__version__ = "2.4.1"
-__build__ = "rel_2.4.0:3365:9259ea1c13d7"
+__build__ = "rel_2.4.1:3453:73fefd3ea0b0"
-__buildsys__ = "hpmicrodog"
+__buildsys__ = "ubuntu1404-32bit"
-__date__ = "2015/09/21 14:03:43"
+__date__ = "2015/11/09 03:25:05"
__developer__ = "bdbaddog"
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index 35dad8a..775f23b 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.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
+__revision__ = "src/script/sconsign.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
-__version__ = "2.4.0"
+__version__ = "2.4.1"
-__build__ = "rel_2.4.0:3365:9259ea1c13d7"
+__build__ = "rel_2.4.1:3453:73fefd3ea0b0"
-__buildsys__ = "hpmicrodog"
+__buildsys__ = "ubuntu1404-32bit"
-__date__ = "2015/09/21 14:03:43"
+__date__ = "2015/11/09 03:25:05"
__developer__ = "bdbaddog"