[issm-svn] r23303 - issm/trunk/packagers/win10

[jdquinn at issm.ess.uci.edu]

Author: jdquinn
Date: 2018-09-18 01:01:16 -0700 (Tue, 18 Sep 2018)
New Revision: 23303

Modified:
   issm/trunk/packagers/win10/package64.sh
Log:
CHG: Packaging Win10 binaries instead as a tarball

Modified: issm/trunk/packagers/win10/package64.sh
===================================================================
--- issm/trunk/packagers/win10/package64.sh	2018-09-18 07:41:04 UTC (rev 23302)
+++ issm/trunk/packagers/win10/package64.sh	2018-09-18 08:01:16 UTC (rev 23303)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Set path to matlab
-MATLAB=/cygdrive/c/Programs/MATLAB/R2015a/bin/matlab
+# Source Windows environment
+source $ISSM_DIR/externalpackages/windows/windows_environment.sh
 
 echo "Making generic_static.m work like generic.m"
 cd $ISSM_DIR/bin
@@ -18,7 +18,7 @@
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
 
-$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
+$MATLAB_PATH/bin/matlab -nodisplay -nosplash -r "try, addpath $ISSM_DIR_WIN/bin $ISSM_DIR_WIN/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
 	echo "test101 FAILED"