summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-03-10 14:14:33 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-03-10 14:14:33 +0100
commitdf69433d6a185b997f1ec3c0d30768061c5b500f (patch)
treef976ed6769e1273e04dca843c18d8bf87fc9b976 /src/script
parentda3aa9be25ad2463a8f27318b914d2322f782a9e (diff)
parent68e4fe5ac49effe8959bc8532584edf04553c931 (diff)
Merge commit 'upstream/1.2.0.d20100306'
Diffstat (limited to 'src/script')
-rw-r--r--src/script/README.txt4
-rw-r--r--src/script/scons-post-install.py2
-rw-r--r--src/script/scons-time.py2
-rw-r--r--src/script/scons.bat6
-rw-r--r--src/script/scons.py25
-rw-r--r--src/script/sconsign.py25
-rw-r--r--src/script/setup.py4
7 files changed, 47 insertions, 21 deletions
diff --git a/src/script/README.txt b/src/script/README.txt
index d841b26..49f0f3c 100644
--- a/src/script/README.txt
+++ b/src/script/README.txt
@@ -5,12 +5,12 @@
### A SEPARATE SCRIPT PACKAGE IN THE FUTURE.
###
# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-# src/script/README.txt 4629 2010/01/17 22:23:21 scons
+# src/script/README.txt 4691 2010/03/06 16:22:36 bdbaddog
SCons - a software construction tool
- Version 1.2.0.d20100117
+ Version 1.2.0.d20100306
This is an alpha release of SCons, a tool for building software (and
diff --git a/src/script/scons-post-install.py b/src/script/scons-post-install.py
index 53ea180..f62b0d8 100644
--- a/src/script/scons-post-install.py
+++ b/src/script/scons-post-install.py
@@ -31,7 +31,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/script/scons-post-install.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/script/scons-post-install.py 4691 2010/03/06 16:22:36 bdbaddog"
import os.path
import sys
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 969cfa6..a6e2142 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -33,7 +33,7 @@
from __future__ import nested_scopes
-__revision__ = "src/script/scons-time.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/script/scons-time.py 4691 2010/03/06 16:22:36 bdbaddog"
import getopt
import glob
diff --git a/src/script/scons.bat b/src/script/scons.bat
index 69fa8f1..df01d9d 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
@REM Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-@REM src/script/scons.bat 4629 2010/01/17 22:23:21 scons
+@REM src/script/scons.bat 4691 2010/03/06 16:22:36 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-1.2.0.d20100117'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100117'), 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-1.2.0.d20100306'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100306'), 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
@@ -17,7 +17,7 @@ goto endscons
setlocal
@REM ensure the script will be executed with the Python it was installed for
set path=%~dp0;%~dp0..;%path%
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100117'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100117'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100306'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100306'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%
if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto returncode
diff --git a/src/script/scons.py b/src/script/scons.py
index 219dd73..a8438d8 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -24,17 +24,17 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/script/scons.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/script/scons.py 4691 2010/03/06 16:22:36 bdbaddog"
-__version__ = "1.2.0.d20100117"
+__version__ = "1.2.0.d20100306"
-__build__ = "r4629"
+__build__ = "r4691"
-__buildsys__ = "scons-dev"
+__buildsys__ = "mvdog"
-__date__ = "2010/01/17 22:23:21"
+__date__ = "2010/03/06 16:22:36"
-__developer__ = "scons"
+__developer__ = "bdbaddog"
import os
import os.path
@@ -160,6 +160,19 @@ else:
# Check /usr/libfoo/scons*.
prefs.append(libpath)
+ try:
+ import pkg_resources
+ except ImportError:
+ pass
+ else:
+ # when running from an egg add the egg's directory
+ try:
+ d = pkg_resources.get_distribution('scons')
+ except pkg_resources.DistributionNotFound:
+ pass
+ else:
+ prefs.append(d.location)
+
# Look first for 'scons-__version__' in all of our preference libs,
# then for 'scons'.
libs.extend(map(lambda x: os.path.join(x, scons_version), prefs))
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index dcaad40..b461c54 100644
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -24,17 +24,17 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/script/sconsign.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/script/sconsign.py 4691 2010/03/06 16:22:36 bdbaddog"
-__version__ = "1.2.0.d20100117"
+__version__ = "1.2.0.d20100306"
-__build__ = "r4629"
+__build__ = "r4691"
-__buildsys__ = "scons-dev"
+__buildsys__ = "mvdog"
-__date__ = "2010/01/17 22:23:21"
+__date__ = "2010/03/06 16:22:36"
-__developer__ = "scons"
+__developer__ = "bdbaddog"
import os
import os.path
@@ -148,6 +148,19 @@ else:
# Check /usr/libfoo/scons*.
prefs.append(libpath)
+ try:
+ import pkg_resources
+ except ImportError:
+ pass
+ else:
+ # when running from an egg add the egg's directory
+ try:
+ d = pkg_resources.get_distribution('scons')
+ except pkg_resources.DistributionNotFound:
+ pass
+ else:
+ prefs.append(d.location)
+
# Look first for 'scons-__version__' in all of our preference libs,
# then for 'scons'.
libs.extend(map(lambda x: os.path.join(x, scons_version), prefs))
diff --git a/src/script/setup.py b/src/script/setup.py
index e204473..15adc61 100644
--- a/src/script/setup.py
+++ b/src/script/setup.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/script/setup.py 4629 2010/01/17 22:23:21 scons"
+__revision__ = "src/script/setup.py 4691 2010/03/06 16:22:36 bdbaddog"
import os
import os.path
@@ -36,7 +36,7 @@ if head:
from distutils.core import setup
setup(name = "scons-script",
- version = "1.2.0.d20100117",
+ version = "1.2.0.d20100306",
description = "an Open Source software construction tool script",
long_description = """SCons is an Open Source software construction tool--that is, a build tool; an
improved substitute for the classic Make utility; a better way to build