Changeset 20340


Ignore:
Timestamp:
03/24/16 09:45:58 (9 years ago)
Author:
Mathieu Morlighem
Message:

CHG: testing new way of configuring

Location:
issm/trunk-jpl/jenkins
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/jenkins.sh

    r20339 r20340  
    157157then
    158158        cd $ISSM_DIR
    159         make uninstall
    160         make clean
    161         make distclean
     159        #make uninstall
     160        #make clean
     161        #make distclean
    162162        ./scripts/automakererun.sh
    163         cat > configure.sh << EOF
    164 #Define MATLAB path first:
    165 MATLAB_PATH=$MATLAB_PATH
    166 
    167 #Configure options:
    168 ./configure $ISSM_CONFIG
    169 EOF
    170         chmod 700 configure.sh
    171         ./configure.sh
     163#       cat > configure.sh << EOF
     164##Define MATLAB path first:
     165#MATLAB_PATH=$MATLAB_PATH
     166#
     167##Configure options:
     168#./configure $ISSM_CONFIG
     169#EOF
     170#       chmod 700 configure.sh
     171#       ./configure.sh
     172   eval "./configure $ISSM_CONFIG"
    172173
    173174        #4: compile and install ISSM

  • issm/trunk-jpl/jenkins/linux64_caladan_ad

    r20338 r20340  
    1616                                --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
    1717                                --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
    18                                 --with-matlab-dir=$MATLAB_PATH
     18                                --with-matlab-dir=$MATLAB_PATH \
     19                                --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
    1920
    2021#PYTHON and MATLAB testing

  • issm/trunk-jpl/jenkins/linux64_murdo_ad

    r20338 r20340  
    1515                                --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
    1616                                --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
    17                                 --with-matlab-dir=$MATLAB_PATH
     17                                --with-matlab-dir=$MATLAB_PATH \
     18                                 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
    1819
    1920#PYTHON and MATLAB testing

  • issm/trunk-jpl/jenkins/linux64_ross_ad

    r20338 r20340  
    1919                                --with-python-dir=/usr\
    2020                                --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
     21                                --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
    2122
    2223#PYTHON and MATLAB testing
Note: See TracChangeset for help on using the changeset viewer.