Changeset 817 for branches

Timestamp:

Dec 8, 2007 9:22:35 PM (13 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:

• NBprojectConfig.py (modified) (1 diff)
• NBsvnCommand.py (modified) (3 diffs)
• NBuserParametersDefault.py (modified) (2 diffs)

branches/testScripts/NBprojectConfig.py

@@ -241 +241 @@
 
 #----------------------------------------------------------------------
+PROJECT_EMAIL_ADDRS['CoinAll'] = 'tkr2 _AT_ lehigh _DOT_ edu'
+CFG_BLD_TEST['CoinAll']=[
+                  {'dir':'',
+                   'cmd':'make test',
+                   'check':[ NBcheckResult.rc0 ] } ]
+
+#----------------------------------------------------------------------
 PROJECT_EMAIL_ADDRS['CppAD'] = 'bradbell _AT_ washington _DOT_ edu'
 

branches/testScripts/NBsvnCommand.py

@@ -74 +74 @@
 
 #------------------------------------------------------------------------
-# Return svn revision number or url
+# Return svn revision number from url
 # If not found the return -1
 #------------------------------------------------------------------------
@@ -86 +86 @@
     if len(found)!=0 :
       retVal=int(found[0])
+  return retVal
+
+
+#------------------------------------------------------------------------
+# Return svn url corresponding to given directory
+# If not found the return -1
+#------------------------------------------------------------------------
+def svnUrl(dir) :
+  retVal='error in NBsvnCommand.svnUrl'
+  result = NBosCommand.run('svn info --xml '+dir)
+  if result['returnCode']==0 :
+    reg=r'<url>(.+)</url>'
+    found=re.findall(reg,result['stdout'])
+    if len(found)!=0 :
+      retVal=found[0]
   return retVal
   
@@ -153 +168 @@
   return False
 
+#------------------------------------------------------------------------
+# svnRevisions(target)
+# Return svn version and version of all referenced externals
+#------------------------------------------------------------------------
+def svnRevisions(relPath,revisions) :
+  #path=os.path.join(basePath,relPath)
+  #os.chdir(path)
+  
+  rev=svnRevision(relPath)
+  if rev==-1 : rev = "Error getting svn revision"
+  url=svnUrl(relPath)
+  revisions[relPath]=url+" "+str(rev)
+  
+  # get externals
+  result = NBosCommand.run('svn propget svn:externals '+relPath)
+  if result['returnCode']!=0 : print 'error getting external property'
+  externals = result['stdout']
+
+  for external in externals.split('\n'):
+    if external=="" : continue
+    p=external.split()
+    path=os.path.join(relPath,p[0])
+    #print path
+    svnRevisions(path,revisions)
+  return
+
+#r={}
+#path=os.chdir('/home/jp/COIN/Cbc/trunk')
+#svnRevisions('.',r)
+#print r

branches/testScripts/NBuserParametersDefault.py

@@ -26 +26 @@
 # List of Projects to be processed by script
 #----------------------------------------------------------------------
-PROJECTS = ['CoinUtils','Clp','Osi','DyLP','SYMPHONY','Vol','Cgl','Cbc','Smi','FlopC++','Ipopt','Bonmin','OS','CppAD']
+PROJECTS = ['CoinUtils','Clp','Osi','DyLP','SYMPHONY','Vol','Cgl','Cbc','Smi','FlopC++','Ipopt','Bonmin','OS','CppAD','CoinAll']
 
 #----------------------------------------------------------------------
@@ -145 +145 @@
      #,{ 'SvnVersion': 'latestStable', 'OptLevel': 'Default', 'ThirdParty':'Yes' }
      #,{ 'SvnVersion': 'latestRelease','OptLevel': 'Default', 'ThirdParty':'Yes' }
+     ],
+   'CoinAll' :
+     [
+       { 'SvnVersion': 'trunk', 'OptLevel': 'Default', 'ThirdParty':'Yes' },
+       { 'SvnVersion': 'trunk', 'OptLevel': 'Debug',   'ThirdParty':'Yes' }
      ],
    'LaGO' :