Changeset 829 for trunk/ithildin/build/scons.py

Timestamp:

12/21/08 16:04:24 (3 years ago)

Author:

wd

Message:

Update scons

File:

• trunk/ithildin/build/scons.py (modified) (5 diffs)

trunk/ithildin/build/scons.py

@@ -3 +3 @@
 # SCons - a Software Constructor
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -25 +25 @@
 #
 
-__revision__ = "/home/scons/scons/branch.0/baseline/src/script/scons.py 0.97.D001 2007/05/17 11:35:19 knight"
+__revision__ = "src/script/scons.py 3842 2008/12/20 22:59:52 scons"
 
-__version__ = "0.97"
+__version__ = "1.2.0"
 
-__build__ = "D001"
+__build__ = "r3842"
 
-__buildsys__ = "roxbury"
+__buildsys__ = "scons-dev"
 
-__date__ = "2007/05/17 11:35:19"
+__date__ = "2008/12/20 22:59:52"
 
-__developer__ = "knight"
+__developer__ = "scons"
 
 import os
@@ -67 +67 @@
     libs.append(os.environ["SCONS_LIB_DIR"])
 
-local = 'scons-local-' + __version__
+local_version = 'scons-local-' + __version__
+local = 'scons-local'
 if script_dir:
+    local_version = os.path.join(script_dir, local_version)
     local = os.path.join(script_dir, local)
+libs.append(os.path.abspath(local_version))
 libs.append(os.path.abspath(local))
 
@@ -138 +141 @@
         pass
     else:
-        while libpath:
-            libpath, tail = os.path.split(libpath)
-            if tail[:6] == "python":
-                break
-        if libpath:
-            # Python library is in /usr/libfoo/python*;
-            # check /usr/libfoo/scons*.
-            prefs.append(libpath)
+        # Split /usr/libfoo/python*/os.py to /usr/libfoo/python*.
+        libpath, tail = os.path.split(libpath)
+        # Split /usr/libfoo/python* to /usr/libfoo
+        libpath, tail = os.path.split(libpath)
+        # Check /usr/libfoo/scons*.
+        prefs.append(libpath)
 
 # Look first for 'scons-__version__' in all of our preference libs,
@@ -158 +159 @@
 ##############################################################################
 
-import SCons.Script
-SCons.Script.main()
+if __name__ == "__main__":
+    import SCons.Script
+    # this does all the work, and calls sys.exit
+    # with the proper exit status when done.
+    SCons.Script.main()