diff options
| author | Greg Noel <GregNoel@tigris.org> | 2008-09-26 18:48:37 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2008-09-26 18:48:37 (GMT) |
| commit | 55b3ad3b84bb73bc4e2d7c88bb7b3d2369552724 (patch) | |
| tree | 7882e4c6e4a55799a4ac071a02559d94a1e118f7 | |
| parent | 85d6a7c6c4282981af0c876b2d97f77706a6f420 (diff) | |
| download | SCons-55b3ad3b84bb73bc4e2d7c88bb7b3d2369552724.zip SCons-55b3ad3b84bb73bc4e2d7c88bb7b3d2369552724.tar.gz SCons-55b3ad3b84bb73bc4e2d7c88bb7b3d2369552724.tar.bz2 | |
Revert checkin of incomplete change
| -rw-r--r-- | src/engine/SCons/Tool/sunc++.py | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/src/engine/SCons/Tool/sunc++.py b/src/engine/SCons/Tool/sunc++.py index 2392f26..7ef3e02 100644 --- a/src/engine/SCons/Tool/sunc++.py +++ b/src/engine/SCons/Tool/sunc++.py @@ -34,12 +34,8 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import SCons -subproc = SCons.Action._subproc -import os -import re -import subprocess -PIPE = subprocess.PIPE +import os.path cplusplus = __import__('c++', globals(), locals(), []) @@ -59,33 +55,19 @@ def get_cppc(env): def look_pkg_db(pkginfo=pkginfo, pkgchk=pkgchk): version = None + path = None for package in ['SPROcpl']: - #cmd = "%s -l %s 2>/dev/null" % (pkginfo, package) - cmd = [pkginfo, '-l', package] - c = subproc(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True) - lines,err = c.communicate() - if c.wait(): continue - for line in string.split(lines, '\n'): - # grep '^ *VERSION:' - line = string.strip(line) - if line[:8] == 'VERSION:': break - else: - continue - version = string.split(line)[-1] - #cmd = "%s -l %s 2>/dev/null" % (pkgchk, package) - cmd = [pkgchk, '-l', package] - c = subproc(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True) - lines,err = c.communicate() - if c.wait(): continue - for line in string.split(lines, '\n'): - # grep '^Pathname:.*/bin/CC$' - if line[:9] != 'Pathname:': continue - if line[-7:] != '/bin/CC': continue - # grep -v '/SC[0-9]*\.[0-9]*/' - if re.search(r'/SC[0-9]*\.[0-9]*/', line): continue - return os.path.dirname(string.split(line)[-1]), version - - return None, version + cmd = "%s -l %s 2>/dev/null | grep '^ *VERSION:'" % (pkginfo, package) + line = os.popen(cmd).readline() + if line: + version = line.split()[-1] + cmd = "%s -l %s 2>/dev/null | grep '^Pathname:.*/bin/CC$' | grep -v '/SC[0-9]*\.[0-9]*/'" % (pkgchk, package) + line = os.popen(cmd).readline() + if line: + path = os.path.dirname(line.split()[-1]) + break + + return path, version path, version = look_pkg_db() if path and version: |