[Commits] (markie) Revise method of gcj check for linux

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/chandler/persistence/PyLucene/__hardhat__.py 1.8 1.9

Log message:
Revise method of gcj check for linux


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/chandler/persistence/PyLucene/__hardhat__.py.diff?r1=text&tr1=1.8&r2=text&tr2=1.9

Index: osaf/chandler/persistence/PyLucene/__hardhat__.py
diff -u osaf/chandler/persistence/PyLucene/__hardhat__.py:1.8 osaf/chandler/persistence/PyLucene/__hardhat__.py:1.9
--- osaf/chandler/persistence/PyLucene/__hardhat__.py:1.8	Fri Jan 16 18:40:31 2004
+++ osaf/chandler/persistence/PyLucene/__hardhat__.py	Sat Mar 13 12:54:57 2004
@@ -38,6 +38,12 @@
 
     elif buildenv['os'] == 'posix':
 
+        GCJ_HOME = os.getenv('GCJ_HOME')
+        if GCJ_HOME is None:
+            raise hardhatlib.HardHatBuildEnvError, "GCJ_HOME needs to be set to the parent directory where gcj is installed. See README file."
+
+        GCJ = "GCJ=%s" %(GCJ_HOME)
+
         gcj_version = gcjVer()
         if gcj_version < '3.3':
             raise hardhatlib.HardHatBuildEnvError, "GCJ version 3.3 or later is required to build this module, the version found is '%s'" %(gcj_version)
@@ -107,7 +113,7 @@
     try:
         (stdin, stdout_err) = os.popen4("gcj -v", 'r')
         for line in stdout_err.readlines():
-            if line.find('version') >= 0:
+            if line.find('gcc version') >= 0:
                 return line.split(' ')[2]
     except:
         return None