Changeset 817 for branches


Ignore:
Timestamp:
Dec 8, 2007 9:22:35 PM (12 years ago)
Author:
jpfasano
Message:

Added CoinAll?
Added a new function to NBsvnCommand to get the revision number of all externals

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBprojectConfig.py

    r795 r817  
    241241
    242242#----------------------------------------------------------------------
     243PROJECT_EMAIL_ADDRS['CoinAll'] = 'tkr2 _AT_ lehigh _DOT_ edu'
     244CFG_BLD_TEST['CoinAll']=[
     245                  {'dir':'',
     246                   'cmd':'make test',
     247                   'check':[ NBcheckResult.rc0 ] } ]
     248
     249#----------------------------------------------------------------------
    243250PROJECT_EMAIL_ADDRS['CppAD'] = 'bradbell _AT_ washington _DOT_ edu'
    244251
  • branches/testScripts/NBsvnCommand.py

    r773 r817  
    7474
    7575#------------------------------------------------------------------------
    76 # Return svn revision number or url
     76# Return svn revision number from url
    7777# If not found the return -1
    7878#------------------------------------------------------------------------
     
    8686    if len(found)!=0 :
    8787      retVal=int(found[0])
     88  return retVal
     89
     90
     91#------------------------------------------------------------------------
     92# Return svn url corresponding to given directory
     93# If not found the return -1
     94#------------------------------------------------------------------------
     95def svnUrl(dir) :
     96  retVal='error in NBsvnCommand.svnUrl'
     97  result = NBosCommand.run('svn info --xml '+dir)
     98  if result['returnCode']==0 :
     99    reg=r'<url>(.+)</url>'
     100    found=re.findall(reg,result['stdout'])
     101    if len(found)!=0 :
     102      retVal=found[0]
    88103  return retVal
    89104 
     
    153168  return False
    154169
     170#------------------------------------------------------------------------
     171# svnRevisions(target)
     172# Return svn version and version of all referenced externals
     173#------------------------------------------------------------------------
     174def svnRevisions(relPath,revisions) :
     175  #path=os.path.join(basePath,relPath)
     176  #os.chdir(path)
     177 
     178  rev=svnRevision(relPath)
     179  if rev==-1 : rev = "Error getting svn revision"
     180  url=svnUrl(relPath)
     181  revisions[relPath]=url+" "+str(rev)
     182 
     183  # get externals
     184  result = NBosCommand.run('svn propget svn:externals '+relPath)
     185  if result['returnCode']!=0 : print 'error getting external property'
     186  externals = result['stdout']
     187
     188  for external in externals.split('\n'):
     189    if external=="" : continue
     190    p=external.split()
     191    path=os.path.join(relPath,p[0])
     192    #print path
     193    svnRevisions(path,revisions)
     194  return
     195
     196#r={}
     197#path=os.chdir('/home/jp/COIN/Cbc/trunk')
     198#svnRevisions('.',r)
     199#print r
  • branches/testScripts/NBuserParametersDefault.py

    r786 r817  
    2626# List of Projects to be processed by script
    2727#----------------------------------------------------------------------
    28 PROJECTS = ['CoinUtils','Clp','Osi','DyLP','SYMPHONY','Vol','Cgl','Cbc','Smi','FlopC++','Ipopt','Bonmin','OS','CppAD']
     28PROJECTS = ['CoinUtils','Clp','Osi','DyLP','SYMPHONY','Vol','Cgl','Cbc','Smi','FlopC++','Ipopt','Bonmin','OS','CppAD','CoinAll']
    2929
    3030#----------------------------------------------------------------------
     
    145145     #,{ 'SvnVersion': 'latestStable', 'OptLevel': 'Default', 'ThirdParty':'Yes' }
    146146     #,{ 'SvnVersion': 'latestRelease','OptLevel': 'Default', 'ThirdParty':'Yes' }
     147     ],
     148   'CoinAll' :
     149     [
     150       { 'SvnVersion': 'trunk', 'OptLevel': 'Default', 'ThirdParty':'Yes' },
     151       { 'SvnVersion': 'trunk', 'OptLevel': 'Debug',   'ThirdParty':'Yes' }
    147152     ],
    148153   'LaGO' :
Note: See TracChangeset for help on using the changeset viewer.