diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 20:22:55 +0200 |
| commit | 0b1559616669d8a8c28dcd78f192c051efec323b (patch) | |
| tree | 8026a245654dcbaab45384972a02a7166af58db5 /script | |
| parent | 9ddba95984d3c5bcc02deb636244cac8f1fd686f (diff) | |
| parent | 665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'script')
| -rw-r--r-- | script/scons | 6 | ||||
| -rw-r--r-- | script/scons-time | 2 | ||||
| -rw-r--r-- | script/scons.bat | 4 | ||||
| -rw-r--r-- | script/sconsign | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/script/scons b/script/scons index 9651c88..c917f47 100644 --- a/script/scons +++ b/script/scons @@ -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 2014/08/24 12:12:31 garyo" +__revision__ = "src/script/scons.py 2014/09/27 12:51:43 garyo" -__version__ = "2.3.3" +__version__ = "2.3.4" __build__ = "" __buildsys__ = "lubuntu" -__date__ = "2014/08/24 12:12:31" +__date__ = "2014/09/27 12:51:43" __developer__ = "garyo" diff --git a/script/scons-time b/script/scons-time index 42ddbe0..0a3176b 100644 --- a/script/scons-time +++ b/script/scons-time @@ -32,7 +32,7 @@ from __future__ import division from __future__ import nested_scopes -__revision__ = "src/script/scons-time.py 2014/08/24 12:12:31 garyo" +__revision__ = "src/script/scons-time.py 2014/09/27 12:51:43 garyo" import getopt import glob diff --git a/script/scons.bat b/script/scons.bat index 1584082..75aa236 100644 --- a/script/scons.bat +++ b/script/scons.bat @@ -1,11 +1,11 @@ @REM Copyright (c) 2001 - 2014 The SCons Foundation
-@REM src/script/scons.bat 2014/08/24 12:12:31 garyo
+@REM src/script/scons.bat 2014/09/27 12:51:43 garyo
@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.3.3'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.3'), 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.3.4'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.4'), 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 3a58c3d..b2cf895 100644 --- a/script/sconsign +++ b/script/sconsign @@ -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 2014/08/24 12:12:31 garyo" +__revision__ = "src/script/sconsign.py 2014/09/27 12:51:43 garyo" -__version__ = "2.3.3" +__version__ = "2.3.4" __build__ = "" __buildsys__ = "lubuntu" -__date__ = "2014/08/24 12:12:31" +__date__ = "2014/09/27 12:51:43" __developer__ = "garyo" |