Changeset 771 for branches

Timestamp:

Nov 14, 2007 10:04:33 AM (13 years ago)

Author:

stefan

Message:

run configure only if last configure run was not ok OR svn update updated a configure or a *.in file

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (5 diffs)
• NBsvnCommand.py (modified) (2 diffs)
• nightlyBuild.py (modified) (1 diff)

branches/testScripts/NBbuildConfig.py

@@ -8 +8 @@
 import os
 import sys
+import re
 
 import NBlogMessages
@@ -19 +20 @@
 # subversion repository.
 #---------------------------------------------------------------------
-SVN_HISTORY = []
+SVN_HISTORY = {}
 THIRD_PARTY_HISTORY = []
 
@@ -184 +185 @@
   #---------------------------------------------------------------------
   # Don't get source from subversion if previously done
-  if projectCheckOutDir not in SVN_HISTORY :
+  if not SVN_HISTORY.has_key(projectCheckOutDir) :
     if not os.path.isdir(projectBaseDir) :
       os.makedirs(projectBaseDir)
@@ -193 +194 @@
            ' '+svnVersionFlattened
       commandHistory+=[ svnCmd ]
-      if NBsvnCommand.run(svnCmd,projectBaseDir,configuration['project'])!='OK' :
+      svnResult=NBsvnCommand.run(svnCmd,projectBaseDir,configuration['project'])
+      if svnResult['returnCode'] != 0 :
         return
+      runConfigure = True
     else :
       svnCmd='svn update'
       commandHistory+=[ svnCmd ]
-      if NBsvnCommand.run(svnCmd,projectCheckOutDir,configuration['project'])!='OK' :
+      svnResult=NBsvnCommand.run(svnCmd,projectCheckOutDir,configuration['project'])
+      if svnResult['returnCode'] != 0 :
         return
-    SVN_HISTORY.append(projectCheckOutDir)
+      #check whether a *.in or configure file was updated 
+      r=r'(\S+\.in\s)|(configure\s)'
+      findResult=re.findall(r,svnResult['stdout'])
+      if len(findResult)!=0:
+        runConfigure = True
+      else :
+        runConfigure = False
+
+    SVN_HISTORY[projectCheckOutDir]=runConfigure
   else :
     NBlogMessages.writeMessage('  "svn update" skipped. nightlyBuild has already updated for prior build configuration')
+    runConfigure=SVN_HISTORY[projectCheckOutDir]
 
   #---------------------------------------------------------------------
@@ -281 +294 @@
 
     # If config was previously run, then no need to run again.
-  #  if NBcheckResult.didConfigRunOK() :
-  #    NBlogMessages.writeMessage("  configure previously ran. Not rerunning.")
-  #  else :
-    NBlogMessages.writeMessage("  "+configCmd)
-    commandHistory+=[ configCmd ]
-
-    # Finally run config
-    result=NBosCommand.run(configCmd)
-    writeResults(result,'config') 
-
-    # Check if configure worked
-    if result['returnCode'] != 0 :
+    if (not runConfigure) and NBcheckResult.didConfigRunOK() :
+      NBlogMessages.writeMessage("  configure previously ran. Not rerunning.")
+    else :
+      NBlogMessages.writeMessage("  "+configCmd)
+      commandHistory+=[ configCmd ]
+
+      # Finally run config
+      result=NBosCommand.run(configCmd)
+      writeResults(result,'config') 
+
+      # Check if configure worked
+      if result['returnCode'] != 0 :
         error_msg = result
         error_msg['configure flags']=configOptions

branches/testScripts/NBsvnCommand.py

@@ -21 +21 @@
 #  project: Coin project running the command (this is used to provide
 #           a better message if an error is detected
+#  return: the result of the NBosCommand call;
+#          return['returnCode'] is the return code of svn
 #------------------------------------------------------------------------
 def run(svnCmd,dir,project) :
-  retVal='OK'
   os.chdir(dir)
   NBlogMessages.writeMessage('  cd '+dir)
@@ -29 +30 @@
   result = NBosCommand.run(svnCmd)
   if result['returnCode'] != 0 :
-    NBemail.sendCmdMsgs(project,result,svnCmd)
-    retVal='Error'
-  return retVal
+   NBemail.sendCmdMsgs(project,result,svnCmd)
+  return result
 
 

branches/testScripts/nightlyBuild.py

@@ -60 +60 @@
   if not os.path.isdir(dataDir) :
     svnCmd='svn checkout https://projects.coin-or.org/svn/Data/releases/1.0.4/'+d+' '+d
-    if NBsvnCommand.run(svnCmd,dataBaseDir,'Data')!='OK' :
+    svnResult=NBsvnCommand.run(svnCmd,dataBaseDir,'Data')
+    if svnResult['returnCode'] != 0 :
       sys.exit(1)
     result=NBosCommand.run('find '+d+' -name \*.gz -print | xargs gzip -d')