Changeset 640

Timestamp:

Oct 19, 2007 9:55:11 PM (12 years ago)

Author:

jpfasano

Message:

Added userConfig variable for deciding if 3rd party codes should be downloaded.

Location:

branches/testScripts

Files:

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

branches/testScripts/NBuserConfig.py

@@ -34 +34 @@
   SVNPATH_PREFIX='/gsa/yktgsa/projects/o/oslos/local/bin'
 elif gethostname()=='JPF4' :
-  SVNPATH_PREFIX = r'e:\cygwin\bin'
+  SVNPATH_PREFIX = ''
 elif gethostname()=='kmartin-maclt.local' :
   SVNPATH_PREFIX='/usr/local/bin'
@@ -103 +103 @@
 
 
+#----------------------------------------------------------------------
+# DOWNLOAD_3RD_PARTY: 0 or 1.
+# Several COIN-OR projects provide scripts for downloading 3rd party
+# code that the project will use if it is available.  Some of
+# the this 3rd party code is distributed under various different
+# licenses. A 1 indicates that the script will download 3rd party
+# code if the COIN-OR project provides the script
+# ThirdParty/xxx/get.xxx where xxx is the name of the third party code
+#----------------------------------------------------------------------
+DOWNLOAD_3RD_PARTY=0
+if gethostname()=='ubuntu' :
+  DOWNLOAD_3RD_PARTY=1
+elif gethostname()=='math01.watson.ibm.com' :
+  DOWNLOAD_3RD_PARTY=1
+elif gethostname()=='JPF4' :
+  DOWNLOAD_3RD_PARTY=1
+
 
 #----------------------------------------------------------------------

branches/testScripts/nightlyBuild.py

@@ -13 +13 @@
 
 # TODO:
-#   -After "svn co" then get all 3rd party packages.
 #   -Get some information about the platform and put this in email failure message.
 #   -Implement Kipp's vpath (delete vpath instead of 'make distclean').
@@ -77 +76 @@
   # If there is are third part apps, then get these apps
   #---------------------------------------------------------------------
-  thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
-  if os.path.isdir(thirdPartyBaseDir) :
-    thirdPartyDirs = os.listdir(thirdPartyBaseDir)
-    for d in thirdPartyDirs :
-      thirdPartyDir=os.path.join(thirdPartyBaseDir,d)
-      install3rdPartyCmd=os.path.join(".","get."+d)
-      os.chdir(thirdPartyDir)
-      if os.path.isfile(install3rdPartyCmd) :
-        NBlogMessages.writeMessage('  '+install3rdPartyCmd)
-        NBosCommand.run(install3rdPartyCmd)
+  if NBuserConfig.DOWNLOAD_3RD_PARTY :
+    thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
+    if os.path.isdir(thirdPartyBaseDir) :
+      thirdPartyDirs = os.listdir(thirdPartyBaseDir)
+      for d in thirdPartyDirs :
+        thirdPartyDir=os.path.join(thirdPartyBaseDir,d)
+        install3rdPartyCmd=os.path.join(".","get."+d)
+        os.chdir(thirdPartyDir)
+        if os.path.isfile(install3rdPartyCmd) :
+          NBlogMessages.writeMessage('  '+install3rdPartyCmd)
+          NBosCommand.run(install3rdPartyCmd)
   
   #---------------------------------------------------------------------