Changeset 23303

Timestamp:

09/18/18 01:01:16 (7 years ago)

Author:

jdquinn

Message:

CHG: Packaging Win10 binaries instead as a tarball

File:

• issm/trunk/packagers/win10/package64.sh (modified) (2 diffs)

issm/trunk/packagers/win10/package64.sh

@@ -1 +1 @@
 #!/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"
@@ -19 +19 @@
 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