Changeset 16652

Timestamp:

11/06/13 19:31:43 (12 years ago)

Author:

Eric.Larour

Message:

CHG: configuration changes

Location:

issm/trunk-jpl/jenkins

Files:

• imac (modified) (1 diff)
• linux64_larsen (modified) (2 diffs)
• linux64_murdo (modified) (2 diffs)

issm/trunk-jpl/jenkins/imac

@@ -50 +50 @@
 # - "none"    leave external packages as is
 #             ->skip to section 4
-ISSM_EXTERNALPACKAGES="none"
+ISSM_EXTERNALPACKAGES="install"
 EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages
 

issm/trunk-jpl/jenkins/linux64_larsen

@@ -22 +22 @@
         --with-petsc-arch=$ISSM_ARCH \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+        --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
@@ -49 +50 @@
 # - "none"    leave external packages as is
 #             ->skip to section 4
-ISSM_EXTERNALPACKAGES="none"
+ISSM_EXTERNALPACKAGES="install"
 EXTERNALPACKAGESDIR=$ISSM_DIR/externalpackages
 

issm/trunk-jpl/jenkins/linux64_murdo

@@ -54 +54 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="shell2junit install.sh"
-#EXTERNALPACKAGES="autotools install.sh                
-#                                               matlab    install.sh                
-#                                               mpich     install-3.0-linux64.sh    
-#                                               cmake     install.sh                
-#                                               petsc     install-3.4-linux64.sh    
-#                                               triangle  install-linux64.sh        
-#                                               boost     install.sh                
-#                                               dakota    install-5.3.1-linux64.sh  
-#                                               tao       install-2.2.sh
-#                                               chaco     install.sh 
-#                                               shell2junit install.sh"
+EXTERNALPACKAGES="autotools install.sh                
+                                                matlab    install.sh                
+                                                mpich     install-3.0-linux64.sh    
+                                                cmake     install.sh                
+                                                petsc     install-3.4-linux64.sh    
+                                                triangle  install-linux64.sh        
+                                                boost     install.sh                
+                                                dakota    install-5.3.1-linux64.sh  
+                                                tao       install-2.2.sh
+                                                chaco     install.sh 
+                                                shell2junit install.sh"
 
 #---------------------#
@@ -74 +73 @@
 # - "yes" compile ISSM
 # - "no"  do not compile ISSM
-ISSM_COMPILATION="no"
+ISSM_COMPILATION="yes"
 
 #----------------------#