[Commits] (markie) Extract version string from external/Makefile

commits at osafoundation.org commits at osafoundation.org
Fri Apr 23 16:59:23 PDT 2004


Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.7 1.8

Log message:
Extract version string from external/Makefile


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

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.7 osaf/hardhat/buildscripts/chandler-newbuild.py:1.8
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.7	Fri Apr 23 16:33:36 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Fri Apr 23 16:58:52 2004
@@ -153,6 +153,9 @@
     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")
 
     if not changesAtAll:
         return "no_changes"
@@ -204,7 +207,10 @@
     else:
         bigBLittleB = "b"
 
-    try: # build
+    # Make sure this is not the first time through
+    #   if the first time, we need to do everything
+    if not exists (os.path.join(extModuleDir, "sources-" + version + ".tar.gz")):
+        log.write("Initial construction of " + version + " build - - - \n")
         if mode == "debug":
             print "Building debug"
             log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
@@ -246,6 +252,9 @@
              [buildenv['make'], "binaries" ],
              "Making internal binaries")
 
+        
+
+    try: # build
     except Exception, e:
         print "a build error"
         log.write("***Error during build***" + "\n")



More information about the Commits mailing list