Revert checkin of incomplete change

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3491 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Tool/sunc++.py b/src/engine/SCons/Tool/sunc++.py
index 2392f266b11f83a8b34ff252f8e4847807edb731..7ef3e02309209ddb96039112b4f040b5789f2ed0 100644 (file)
--- 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: