Changeset 625

Timestamp:

Oct 17, 2007 12:27:05 AM (12 years ago)

Author:

kmartin

Message:

add SVNPATH_PREFIX to svn command

Location:

branches/testScripts

Files:

• NBuserConfig.py (modified) (4 diffs)
• nightlyBuild.py (modified) (2 diffs)

branches/testScripts/NBuserConfig.py

@@ -8 +8 @@
 #----------------------------------------------------------------------
 
-print gethostname()
+
 
 #----------------------------------------------------------------------
@@ -21 +21 @@
 else :
   NIGHTLY_BUILD_ROOT_DIR = '/Users/kmartin/COIN'
+
+SVNPATH_PREFIX=''
   
 
@@ -71 +73 @@
   MY_EMAIL_ADDR='kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
   SEND_MAIL_TO_PROJECT_MANAGER=0
+  SVNPATH_PREFIX='/usr/local/bin/'
 
 
@@ -77 +80 @@
 #----------------------------------------------------------------------
 PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc','Ipopt','OS','CppAD']
-PROJECTS = ['CppAD']
+PROJECTS = ['CoinUtils']
 
 

branches/testScripts/nightlyBuild.py

@@ -128 +128 @@
   dataDir=os.path.join(dataBaseDir,d)
   if not os.path.isdir(dataDir) :
-    svnCmd='svn checkout https://projects.coin-or.org/svn/Data/releases/1.0.0/'+d+' '+d
+    svnCmd=os.path.join(NBuserConfig.SVNPATH_PREFIX,'svn') + ' checkout https://projects.coin-or.org/svn/Data/releases/1.0.0/'+d+' '+d
     if issueSvnCmd(svnCmd,dataBaseDir,'Data')!='OK' :
       sys.exit(1)
@@ -150 +150 @@
     os.makedirs(projectBaseDir)
   if not os.path.isdir(projectCheckOutDir) :
-    svnCmd='svn checkout https://projects.coin-or.org/svn/'+p+'/trunk trunk'
+    svnCmd=os.path.join(NBuserConfig.SVNPATH_PREFIX,'svn') + ' checkout https://projects.coin-or.org/svn/'+p+'/trunk trunk'
     if issueSvnCmd(svnCmd,projectBaseDir,p)!='OK' :
       continue
   else :
-    svnCmd='svn update'
+    svnCmd=os.path.join(NBuserConfig.SVNPATH_PREFIX,'svn') + ' update'
     if issueSvnCmd(svnCmd,projectCheckOutDir,p)!='OK' :
       continue