Changeset 23298 for issm/trunk

Timestamp:

09/18/18 00:00:03 (7 years ago)

Author:

jdquinn

Message:

CHG: Packaging Win10 binaries instead as a tarball

Location:

issm/trunk/packagers/win10

Files:

• ISSM.initial.aip (deleted)
• ISSMlogo.ico (deleted)
• package32.sh (deleted)
• package64.sh (modified) (1 diff)
• startup.m (deleted)

issm/trunk/packagers/win10/package64.sh

@@ -1 +1 @@
 #!/bin/bash
 
-#get brand new project:
-rm -rf ISSM.aip  ISSM-SetupFiles ISSM.msi
-cp ISSM.initial.aip ISSM.aip
-
-#recover version:
+# Recover version
 version=`svn info | grep Revision | awk '{printf("%s\n",$2);}'`
 
-#get windows style path to files
+# Get windows style path to files
 export ISSM_DIR_WIN=`cygpath -m "$ISSM_DIR"`
 
+# Set path to matlab
+MATLAB=/cygdrive/c/Programs/MATLAB/R2015a/matlab
+
+echo "Making generic_static.m work like generic.m"
+cd $ISSM_DIR/bin
+cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
+
+echo "Copying scripts from /src to /bin"
 echo "----------------------------------"
 rm $ISSM_DIR/bin/*.m
-find $ISSM_DIR/src/m -name '*.m' | xargs cp -t $ISSM_DIR/bin/
+find $ISSM_DIR/src/m -name '*.m' | xargs cp -t $ISSM_DIR/bin
 ls $ISSM_DIR/bin
 echo "----------------------------------"
 
-#build list of files to put into the installer:
-rm -rf ISSM.aic
-cat << END > ISSM.aic
-;aic
-SetVersion "$version"
-SetPackageName "ISSM.msi"
-END
+# Check that test 101 runs
+cd $ISSM_DIR/test/NightlyRun
+rm matlab.log
 
-ls $ISSM_DIR_WIN/scripts/*.bat startup.m | awk '{printf("AddFile APPDIR %s\n",$1);}' | sed 's/\//\\/g' >> ISSM.aic
+$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
 
-cat << END >> ISSM.aic
-AddFolder PersonalFolder $ISSM_DIR_WIN\test
-AddFolder PersonalFolder $ISSM_DIR_WIN\examples
-AddFolder APPDIR $ISSM_DIR_WIN\bin
-AddFolder APPDIR $ISSM_DIR_WIN\lib
-NewEnvironment -name ISSM_TESTS -value [test_Dir]
-NewEnvironment -name ISSM_DIR -value [APPDIR]
-NewEnvironment -name ISSM_DIR_WIN -value [APPDIR]
-Save
-Rebuild
-END
-#Not needed anymore?
-#DelEnvironment ISSM_TESTS
-#DelEnvironment ISSM_DIR
-#DelEnvironment ISSM_DIR_WIN
+if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
+        echo "test101 FAILED"
+        exit 1;
+else
+        echo "test101 passed"
+fi
 
-#Run installer:
-"C:/Program Files (x86)/Caphyon/Advanced Installer 10.8/bin/x86/AdvancedInstaller.com" /execute  ./ISSM.aip ./ISSM.aic
+# Create tarball
+TARBALL_NAME=ISSM-Win10-64.tar.gz
 
-#Get rid of temporary files:
-cp ISSM-SetupFiles/ISSM.msi ./
-rm -rf ISSM.aip ISSM-SetupFiles ISSM.aic
+cd $ISSM_DIR
+rm $tarball_name
+rm -rf trunk
+mkdir trunk
+
+echo "Creating tarball: ${TARBALL_NAME}"
+cp -rf bin lib test examples scripts trunk/
+tar -czf $TARBALL_NAME trunk
+ls -lah $TARBALL_NAME
+
 
 #To upload to website:
-scp ISSM.msi websites:/home/larour/files/ISSM_Installer-Win_10-64-bit.msi
+scp $TARBALL_NAME websites:/home/larour/files/$TARBALL_NAME