[Commits] (markie) Check for version file, do full build if missing

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.9 1.10

Log message:
Check for version file, do full build if missing


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/buildscripts/chandler-newbuild.py.diff?r1=text&tr1=1.9&r2=text&tr2=1.10

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.9 osaf/hardhat/buildscripts/chandler-newbuild.py:1.10
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.9	Fri Apr 23 17:01:13 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sat Apr 24 00:00:40 2004
@@ -153,9 +153,7 @@
     mainModuleDir = os.path.join(modeDir, mainModule)
     extModuleDir = os.path.join(modeDir, "external")
     intModuleDir = os.path.join(modeDir, "internal")
-    version = hardhatutil.executeCommandReturnOutput(
-     [buildenv['grep'], "VERSION=", os.path.join(extModuleDir, "Makefile") ],
-     "Looking up version string")
+    version = getVersion(os.path.join(extModuleDir, "Makefile"))
 
     if not changesAtAll:
         return "no_changes"
@@ -371,3 +369,16 @@
         line = input.readline()
     input.close()
 
+def getVersion(fileToRead):
+    input = open(fileToRead, "r")
+    line = input.readline()
+    while line:
+        m=re.match('VERSION=(.*)', line)
+        if not m == 'None':
+            version = m.group(1)
+            input.close()
+            return version
+            
+        line = input.readline()
+    input.close()
+    return 'No Version'