- Timestamp:
- Nov 14, 2007 10:04:33 AM (13 years ago)
- Location:
- branches/testScripts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/testScripts/NBbuildConfig.py
r770 r771 8 8 import os 9 9 import sys 10 import re 10 11 11 12 import NBlogMessages … … 19 20 # subversion repository. 20 21 #--------------------------------------------------------------------- 21 SVN_HISTORY = []22 SVN_HISTORY = {} 22 23 THIRD_PARTY_HISTORY = [] 23 24 … … 184 185 #--------------------------------------------------------------------- 185 186 # Don't get source from subversion if previously done 186 if projectCheckOutDir not in SVN_HISTORY:187 if not SVN_HISTORY.has_key(projectCheckOutDir) : 187 188 if not os.path.isdir(projectBaseDir) : 188 189 os.makedirs(projectBaseDir) … … 193 194 ' '+svnVersionFlattened 194 195 commandHistory+=[ svnCmd ] 195 if NBsvnCommand.run(svnCmd,projectBaseDir,configuration['project'])!='OK' : 196 svnResult=NBsvnCommand.run(svnCmd,projectBaseDir,configuration['project']) 197 if svnResult['returnCode'] != 0 : 196 198 return 199 runConfigure = True 197 200 else : 198 201 svnCmd='svn update' 199 202 commandHistory+=[ svnCmd ] 200 if NBsvnCommand.run(svnCmd,projectCheckOutDir,configuration['project'])!='OK' : 203 svnResult=NBsvnCommand.run(svnCmd,projectCheckOutDir,configuration['project']) 204 if svnResult['returnCode'] != 0 : 201 205 return 202 SVN_HISTORY.append(projectCheckOutDir) 206 #check whether a *.in or configure file was updated 207 r=r'(\S+\.in\s)|(configure\s)' 208 findResult=re.findall(r,svnResult['stdout']) 209 if len(findResult)!=0: 210 runConfigure = True 211 else : 212 runConfigure = False 213 214 SVN_HISTORY[projectCheckOutDir]=runConfigure 203 215 else : 204 216 NBlogMessages.writeMessage(' "svn update" skipped. nightlyBuild has already updated for prior build configuration') 217 runConfigure=SVN_HISTORY[projectCheckOutDir] 205 218 206 219 #--------------------------------------------------------------------- … … 281 294 282 295 # If config was previously run, then no need to run again. 283 # ifNBcheckResult.didConfigRunOK() :284 #NBlogMessages.writeMessage(" configure previously ran. Not rerunning.")285 #else :286 NBlogMessages.writeMessage(" "+configCmd)287 commandHistory+=[ configCmd ]288 289 # Finally run config290 result=NBosCommand.run(configCmd)291 writeResults(result,'config')292 293 # Check if configure worked294 if result['returnCode'] != 0 :296 if (not runConfigure) and NBcheckResult.didConfigRunOK() : 297 NBlogMessages.writeMessage(" configure previously ran. Not rerunning.") 298 else : 299 NBlogMessages.writeMessage(" "+configCmd) 300 commandHistory+=[ configCmd ] 301 302 # Finally run config 303 result=NBosCommand.run(configCmd) 304 writeResults(result,'config') 305 306 # Check if configure worked 307 if result['returnCode'] != 0 : 295 308 error_msg = result 296 309 error_msg['configure flags']=configOptions -
branches/testScripts/NBsvnCommand.py
r753 r771 21 21 # project: Coin project running the command (this is used to provide 22 22 # a better message if an error is detected 23 # return: the result of the NBosCommand call; 24 # return['returnCode'] is the return code of svn 23 25 #------------------------------------------------------------------------ 24 26 def run(svnCmd,dir,project) : 25 retVal='OK'26 27 os.chdir(dir) 27 28 NBlogMessages.writeMessage(' cd '+dir) … … 29 30 result = NBosCommand.run(svnCmd) 30 31 if result['returnCode'] != 0 : 31 NBemail.sendCmdMsgs(project,result,svnCmd) 32 retVal='Error' 33 return retVal 32 NBemail.sendCmdMsgs(project,result,svnCmd) 33 return result 34 34 35 35 -
branches/testScripts/nightlyBuild.py
r769 r771 60 60 if not os.path.isdir(dataDir) : 61 61 svnCmd='svn checkout https://projects.coin-or.org/svn/Data/releases/1.0.4/'+d+' '+d 62 if NBsvnCommand.run(svnCmd,dataBaseDir,'Data')!='OK' : 62 svnResult=NBsvnCommand.run(svnCmd,dataBaseDir,'Data') 63 if svnResult['returnCode'] != 0 : 63 64 sys.exit(1) 64 65 result=NBosCommand.run('find '+d+' -name \*.gz -print | xargs gzip -d')
Note: See TracChangeset
for help on using the changeset viewer.