Imported Upstream version 2.1.0upstream/2.1.0

8 files changed, 52 insertions, 365 deletions

diff --git a/src/script/README.txt b/src/script/README.txt
deleted file mode 100644
index 91e826c..0000000
--- a/src/script/README.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-###
-### THIS FILE IS NO LONGER USED.  THIS IS THE README FILE FOR THE
-### SEPARATE SCRIPT PACKAGE FROM THE ORIGINAL (DRAFT) PACKAGING
-### SCHEME.  WE'RE SAVING THIS IN CASE WE NEED OR WANT TO RESURRECT
-### 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 5134 2010/08/16 23:02:40 bdeegan
-
-
-                 SCons - a software construction tool
-
-                         Version 2.0.1
-
-
-This is an alpha release of SCons, a tool for building software (and
-other files).  SCons is implemented in Python, and its "configuration
-files" are actually Python scripts, allowing you to use the full power
-of a real scripting language to solve build problems.  You do not,
-however, need to know Python to use SCons effectively.
-
-
-LATEST VERSION
-==============
-
-Before going further, you can check that this package you have is
-the latest version by checking the SCons download page at:
-
-        http://www.scons.org/download.html
-
-
-ABOUT SCONS PACKAGES
-====================
-
-The complete SCons system is comprised of three separate packages:
-
-    scons
-        The scons script itself, plus the SCons build engine
-        installed into an SCons-specific library directory.
-
-    python-scons
-        The SCons build engine, installed into the standard
-        Python library directory.
-
-    scons-script [THIS PACKAGE]
-        Only the scons script itself.
-
-Depending on what you want to do with SCons, you may need to install
-additional (or other) packages:
-
-    If you just want to use scons (the script) to build software:
-
-        Do NOT install this package.  Install the scons package instead,
-        which contains a copy of both the script and the build engine.
-        You will not need to install any other packages.
-
-    If you do NOT want to use the scons script, but you want to use the
-    SCons build engine in other Python software:
-
-        Do NOT install this package.  Install the python-scons package
-        instead.
-
-    If you want to use the scons script AND you want to use the SCons
-    build engine in other Python software:
-
-        Do NOT install this package.  Install both the scons and
-        python-scons packages instead.
-
-        Note that this installs two separate copies of the build engine,
-        one (in an SCons-specific library directory) used by the scons
-        script itself and one (in the standard Python library) used by
-        other software.  This allows you the flexibility to upgrade
-        one build engine without affecting the other.
-
-    If you want the scons script and other Python software to use the
-    same version of the build engine:
-
-        Install this package AND the python-scons package.
-
-
-INSTALLATION
-============
-
-To install this package, simply run the provided Python-standard setup
-script as follows:
-
-        # python setup.py
-
-You should have system installation privileges (that is, "root" or
-"Administrator") when running the setup.py script.
-
-
-DOCUMENTATION
-=============
-
-Documentation for SCons is available at:
-
-        http://www.scons.org/doc.html
-
-
-LICENSING
-=========
-
-SCons is distributed under the MIT license, a full copy of which is
-available in the LICENSE.txt file. The MIT license is an approved Open
-Source license, which means:
-
-        This software is OSI Certified Open Source Software.  OSI
-        Certified is a certification mark of the Open Source Initiative.
-
-More information about OSI certifications and Open Source software is
-available at:
-
-        http://www.opensource.org/
-
-
-REPORTING BUGS
-==============
-
-You can report bugs either by following the "Tracker - Bugs" link
-on the SCons project page:
-
-        http://sourceforge.net/projects/scons/
-
-or by sending mail to the SCons developers mailing list:
-
-        scons-devel@lists.sourceforge.net
-
-
-MAILING LISTS
-=============
-
-A mailing list for users of SCons is available.  You may send
-questions or comments to the list at:
-
-        scons-users@lists.sourceforge.net
-
-You may subscribe to the mailing list at:
-
-        http://lists.sourceforge.net/lists/listinfo/scons-users
-
-There is also a low-volume mailing list available for announcements
-about SCons.  Subscribe at:
-
-        http://lists.sourceforge.net/lists/listinfo/scons-announce
-
-
-FOR MORE INFORMATION
-====================
-
-Check the SCons web site at:
-
-        http://www.scons.org/
-
-
-AUTHOR INFO
-===========
-
-Steven Knight
-knight at baldmt dot com
-http://www.baldmt.com/~knight/
-
-With more than a little help from:
-        Chad Austin
-        Charles Crain
-        Steve Leblanc
-        Anthony Roach
-        Steven Shaw
-
diff --git a/src/script/scons-post-install.py b/src/script/scons-post-install.py
deleted file mode 100644
index 20cfcbe..0000000
--- a/src/script/scons-post-install.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env python
-#
-# scons-post-install - SCons post install script for Windows 
-#
-# A script for configuring "App Paths" registry key so that SCons could
-# be run from any directory the same way Python is. 
-#
-
-#
-# SCons - a Software Constructor
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# 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-post-install.py 5134 2010/08/16 23:02:40 bdeegan"
-
-import os
-import sys
-import imp
-
-try:
-    # Before Python 3.0, the 'winreg' module was named '_winreg'
-    sys.modules['winreg'] = \
-                imp.load_module('winreg', *imp.find_module('_winreg'))
-except ImportError:
-    # No '_winreg' module: either 3.x or not Windows
-    pass
-
-scons_bat_path = os.path.join(sys.prefix, 'Scripts', 'scons.bat')
-
-app_paths_key = r'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\SCons.bat'
-
-def install():
-    if sys.platform == 'win32':
-        try:
-            import winreg
-        except ImportError:
-            pass
-        else:
-            print 'Writing "App Paths" registry entry for %s' % scons_bat_path
-            winreg.SetValue(
-                winreg.HKEY_LOCAL_MACHINE, 
-                app_paths_key,
-                winreg.REG_SZ,
-                scons_bat_path)
-            print 'Done.'
-
-
-def remove():
-    if sys.platform == 'win32':
-        try:
-            import winreg
-        except ImportError:
-            pass
-        else:
-            # print 'Remove "App Paths" registry entry'
-            winreg.DeleteKey(winreg.HKEY_LOCAL_MACHINE, app_paths_key)
-
-
-if len(sys.argv) > 1:
-    if sys.argv[1] == '-install':
-        install()
-    elif sys.argv[1] == '-remove':
-        remove()
-
-sys.exit(0)
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index 36bdeb5..ace2d85 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -9,7 +9,7 @@
 #
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import nested_scopes
 
-__revision__ = "src/script/scons-time.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/script/scons-time.py 5357 2011/09/09 21:31:03 bdeegan"
 
 import getopt
 import glob
diff --git a/src/script/scons.bat b/src/script/scons.bat
index 33ed144..1648cb3 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 5134 2010/08/16 23:02:40 bdeegan

+@REM Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation

+@REM src/script/scons.bat 5357 2011/09/09 21:31:03 bdeegan

 @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.0.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.0.1'), 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.1.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.1.0'), 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,10 @@ 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-2.0.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.0.1'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*

+@REM try the script named as the .bat file in current dir, then in Scripts subdir

+set scriptname=%~dp0%~n0.py

+if not exist %scriptname% set scriptname=%~dp0Scripts\%~n0.py

+python "%scriptname%" %*

 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 bf84bf0..0e5b8ec 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -2,7 +2,7 @@
 #
 # SCons - a Software Constructor
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,22 +22,20 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # 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 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/script/scons.py 5357 2011/09/09 21:31:03 bdeegan"
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"
 
-__build__ = "r5134"
+__build__ = "r5357[MODIFIED]"
 
-__buildsys__ = "cooldog"
+__buildsys__ = "ubuntu"
 
-__date__ = "2010/08/16 23:02:40"
+__date__ = "2011/09/09 21:31:03"
 
 __developer__ = "bdeegan"
 
 import os
-import os.path
 import sys
 
 ##############################################################################
@@ -61,7 +59,8 @@ import sys
 # If so exit with error message
 try:
     if  sys.version_info >= (3,0,0):
-        msg = "scons: *** SCons version %s does not run under Python version %s.\n"
+        msg = "scons: *** SCons version %s does not run under Python version %s.\n\
+Python 3.0 and later are not yet supported.\n"
         sys.stderr.write(msg % (__version__, sys.version.split()[0]))
         sys.exit(1)
 except AttributeError:
@@ -89,8 +88,22 @@ libs.append(os.path.abspath(local))
 
 scons_version = 'scons-%s' % __version__
 
+# preferred order of scons lookup paths
 prefs = []
 
+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)
+
 if sys.platform == 'win32':
     # sys.prefix is (likely) C:\Python*;
     # check only C:\Python*.
@@ -159,19 +172,6 @@ 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([os.path.join(x, scons_version) for x in prefs])
diff --git a/src/script/sconsign.py b/src/script/sconsign.py
index adf3d28..4debf04 100644
--- a/src/script/sconsign.py
+++ b/src/script/sconsign.py
@@ -2,7 +2,7 @@
 #
 # SCons - a Software Constructor
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,21 +23,20 @@
 # 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 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/script/sconsign.py 5357 2011/09/09 21:31:03 bdeegan"
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"
 
-__build__ = "r5134"
+__build__ = "r5357[MODIFIED]"
 
-__buildsys__ = "cooldog"
+__buildsys__ = "ubuntu"
 
-__date__ = "2010/08/16 23:02:40"
+__date__ = "2011/09/09 21:31:03"
 
 __developer__ = "bdeegan"
 
 import os
 import sys
-import time
 
 ##############################################################################
 # BEGIN STANDARD SCons SCRIPT HEADER
@@ -75,8 +74,22 @@ libs.append(os.path.abspath(local))
 
 scons_version = 'scons-%s' % __version__
 
+# preferred order of scons lookup paths
 prefs = []
 
+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)
+
 if sys.platform == 'win32':
     # sys.prefix is (likely) C:\Python*;
     # check only C:\Python*.
@@ -145,19 +158,6 @@ 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([os.path.join(x, scons_version) for x in prefs])
@@ -172,6 +172,7 @@ sys.path = libs + sys.path
 import SCons.compat   # so pickle will import cPickle instead
 
 import whichdb
+import time
 import pickle
 import imp
 
diff --git a/src/script/setup.cfg b/src/script/setup.cfg
deleted file mode 100644
index 94ede1f..0000000
--- a/src/script/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_rpm]
-group = Development/Tools
diff --git a/src/script/setup.py b/src/script/setup.py
deleted file mode 100644
index 68c1c37..0000000
--- a/src/script/setup.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# 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/setup.py 5134 2010/08/16 23:02:40 bdeegan"
-
-import os
-import os.path
-import sys
-
-(head, tail) = os.path.split(sys.argv[0])
-
-if head:
-    os.chdir(head)
-    sys.argv[0] = tail
-
-from distutils.core import setup
-
-setup(name = "scons-script",
-      version = "2.0.1",
-      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
-software.""",
-      author = "Steven Knight",
-      author_email = "knight@baldmt.com",
-      url = "http://www.scons.org/",
-      licence = "MIT, freely distributable",
-      keywords = "scons, cons, make, build tool, make tool",
-      scripts = ["scons"])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: