Changeset 22893

Timestamp:

07/02/18 10:52:09 (7 years ago)

Author:

Eric.Larour

Message:

CHG: accepting packages from trunk.

Location:

issm/branches/trunk-larour-NatGeoScience2016/packagers

Files:

• macosx-dakota/package.sh (modified) (1 diff)
• macosx/package.sh (modified) (3 diffs)
• ubuntu/package.sh (modified) (2 diffs)

issm/branches/trunk-larour-NatGeoScience2016/packagers/macosx-dakota/package.sh

@@ -11 +11 @@
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-/Applications/MATLAB_R2015b.app/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
+/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -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

issm/branches/trunk-larour-NatGeoScience2016/packagers/macosx/package.sh

@@ -7 +7 @@
 cp ../externalpackages/mpich/install/bin/mpiexec .
 cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+        cp ../externalpackages/gmsh/install/gmsh .
+else
+        echo "gmsh not found"
+fi
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/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
+/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -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
@@ -20 +26 @@
 fi
 
-#Package using the Package Maker from OSX, driven by command line.
 tarball_name='issm-mac-static_build.tar.gz'
 
@@ -31 +36 @@
 rm -rf trunk
 mkdir trunk
-#Need script to download data
 cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk

issm/branches/trunk-larour-NatGeoScience2016/packagers/ubuntu/package.sh

@@ -5 +5 @@
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
 echo "move mpiexec to bin" 
+cp ../externalpackages/mpich/install/bin/mpiexec .
+cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
+echo "move gmsh to bin" 
+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
+        cp ../externalpackages/gmsh/install/gmsh .
+else
+        echo "gmsh not found"
+fi
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/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
@@ -28 +36 @@
 rm -rf trunk
 mkdir trunk
-cp -rf bin lib test examples trunk/
+cp -rf bin lib test examples scripts trunk/
 tar -czf $tarball_name trunk
 ls -lah $tarball_name