Changeset 22171

Timestamp:

10/13/17 15:57:27 (7 years ago)

Author:

dlcheng

Message:

CHG: Updates for Linux_Ubuntu_Binaries build and packager.

Location:

issm/trunk

Files:

• jenkins/linux64_ross_static (modified) (1 diff)
• packagers/ubuntu/package.sh (modified) (1 diff)

issm/trunk/jenkins/linux64_ross_static

@@ -16 +16 @@
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
-        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich -lmpichcxx -lfmpich" \
+        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \

issm/trunk/packagers/ubuntu/package.sh

@@ -11 +11 @@
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-/usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id', 101); exit; catch me, fprintf('%s', getReport(me)); exit; end" -logfile matlab.log
+/usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then