Changeset 16878

Timestamp:

11/21/13 23:11:30 (11 years ago)

Author:

Eric.Larour

Message:

CHG: refining windows platform settings

File:

• issm/trunk-jpl/jenkins/windows (modified) (2 diffs)

issm/trunk-jpl/jenkins/windows

@@ -10 +10 @@
 
 #ISSM Architecture
-ISSM_ARCH="linux-gnu-amd64"
+ISSM_ARCH="cygwin-intel"
 
 #ISSM CONFIGURATION 
-ISSM_CONFIG='--prefix=$ISSM_DIR\
-        --with-matlab-dir=$MATLAB_DIR \
-        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
-        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-petsc-arch=$ISSM_ARCH \
-        --with-python-dir=$ISSM_DIR/externalpackages/python/install\
-        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-numthreads=18 \
-        --with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
-        --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
-        --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-        --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
-        --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
-        --enable-debugging '
+ISSM_CONFIG='--prefix=$ISSM_DIR \
+   --disable-static \
+        --with-vendor=intel-win7-64  \
+        --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
+        --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
+        --with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
+        --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
+        --with-petsc-arch=$ISSM_ARCH  \
+        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
+        --with-mpi-libflags-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+        --with-mpi-libflagss="-Wl,libpetsc.lib" \
+        --with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni"'
 
 #MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
+MATLAB_PATH="C:/MATLAB/R2013a/"
 
 #PYTHON and MATLAB testing
 MATLAB_TEST=1
-PYTHON_TEST=1
+PYTHON_TEST=0
 
 #execution path used for parallel runs
@@ -60 +52 @@
 
 #List of external pakages to be installed and their installation scripts
-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 
-                                                python        install-2.7.3-linux64.sh    
-                                                nose          install-linux64-python2.sh  
-                                                blas          install-linux64.sh          
-                                                lapack        install-linux64.sh          
-                                                git           install.sh                  
-                                                numpy         install-linux64.sh          
-                                                scipy         install-linux64.sh          
-                                                hdf5          install.sh                  
-                                                netcdf        install.sh                  
-                                                netcdf-python install.sh
+EXTERNALPACKAGES="autotools install-win.sh                
+                                                petsc     install-3.1-win7.sh
+                                                triangle  install-win7.sh        
+                                                metis install-4.0-win7.sh
+                                                cccl install-win7.sh
                                                 shell2junit install.sh"
-
 
 #---------------------#