Merge commit 'upstream/2.1.0'

1 files changed, 0 insertions, 74 deletions

diff --git a/src/engine/setup.py b/src/engine/setup.py
deleted file mode 100644
index d116063..0000000
--- a/src/engine/setup.py
+++ /dev/null
@@ -1,74 +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/engine/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
-
-# Code to figure out the package name from the current directory.
-# May come in handy to allow this setup.py to switch-hit between
-# python-scons and python2-scons.
-#head, package = os.path.split(os.getcwd())
-#suffix = "-2.0.1"
-#if package[-len(suffix):] == suffix:
-#    package = package[:-len(suffix)]
-
-package = 'python-scons'
-
-from distutils.core import setup
-
-ver = {
-    'python-scons': '1.5',
-    'python2-scons': '2.1',
-}
-
-setup(name = package,
-      version = "2.0.1",
-      description = "SCons Python %s extension modules" % ver[package],
-      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",
-      packages = ["SCons",
-		  "SCons.Node",
-		  "SCons.Scanner",
-		  "SCons.Sig",
-		  "SCons.Script"])
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4: