diff options
Diffstat (limited to 'third_party/scons/scons.py')
| -rwxr-xr-x | third_party/scons/scons.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/third_party/scons/scons.py b/third_party/scons/scons.py index 8d0d6ea..6456add 100755 --- a/third_party/scons/scons.py +++ b/third_party/scons/scons.py @@ -24,17 +24,17 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/script/scons.py 2928 2008/04/29 22:44:09 knight" +__revision__ = "src/script/scons.py 3424 2008/09/15 11:22:20 scons" -__version__ = "0.98.3" +__version__ = "1.0.1.d20080915" -__build__ = "r2928" +__build__ = "r3424" -__buildsys__ = "bangkok" +__buildsys__ = "scons-dev" -__date__ = "2008/04/29 22:44:09" +__date__ = "2008/09/15 11:22:20" -__developer__ = "knight" +__developer__ = "scons" import os import os.path @@ -66,9 +66,12 @@ libs = [] if os.environ.has_key("SCONS_LIB_DIR"): 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)) scons_version = 'scons-%s' % __version__ @@ -137,14 +140,12 @@ else: except AttributeError: 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, # then for 'scons'. |