Changeset 23403 for issm/trunk


Ignore:
Timestamp:
10/08/18 17:16:31 (6 years ago)
Author:
jdquinn
Message:

CHG: Adjustments to packaging of Mac and Windows binaries

Location:
issm/trunk/packagers
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/packagers/macosx/package.sh

    r23383 r23403  
    11#!/bin/bash
    22
    3 TARBALL_NAME='issm-mac-static_build'
     3MATLAB_PATH="/Applications/MATLAB_R2015b.app"
     4PACKAGE="ISSM" # Name of directory to copy distributable files to
     5TARBALL_NAME="issm-mac-static_build"
    46TARBALL=$TARBALL_NAME.tar.gz
    57
    … …  
    79echo "Cleaning up existing assets"
    810cd $ISSM_DIR
    9 rm -rf trunk
    10 mkdir trunk
     11rm -rf $PACKAGE
     12mkdir $PACKAGE
    1113
    1214# Add/modify required binaries
    … …  
    3133fi
    3234
    33 # Copy gmt to trunk
     35# Copy gmt to package
    3436# NOTE: The following assumes the precompiled version of gmt
    3537echo "Moving gmt to externalpackages"
    3638if [ -f $ISSM_DIR/externalpackages/gmt/install/bin/gmt ]; then
    37         mkdir $ISSM_DIR/trunk/externalpackages
    38         mkdir $ISSM_DIR/trunk/externalpackages/gmt
    39         cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/trunk/externalpackages/gmt
     39        mkdir $ISSM_DIR/$PACKAGE/externalpackages
     40        mkdir $ISSM_DIR/$PACKAGE/externalpackages/gmt
     41        cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/$PACKAGE/externalpackages/gmt
    4042else
    4143        echo "gmt not found"
    … …  
    4547cd $ISSM_DIR/test/NightlyRun
    4648rm matlab.log
    47 /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
     49$MATLAB_PATH/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
    4850
    4951if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
    … …  
    5759cd $ISSM_DIR
    5860rm -f $TARBALL
    59 cp -rf bin lib test examples scripts trunk/
     61cp -rf bin lib test examples scripts $PACKAGE/
    6062
    6163# Create link to gmt from bin
    6264# NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
    63 if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
    64         cd $ISSM_DIR/trunk/bin
     65if [ -f $ISSM_DIR/$PACKAGE/externalpackages/gmt/bin/gmt ]; then
     66        cd $ISSM_DIR/$PACKAGE/bin
    6567        ln -s ../externalpackages/gmt/bin/gmt ./gmt
    6668fi
    6769
    6870cd $ISSM_DIR
    69 tar -czf $TARBALL trunk
     71tar -czf $TARBALL $PACKAGE
    7072ls -lah $TARBALL
    7173

  • issm/trunk/packagers/win10/package64.sh

    r23385 r23403  
    11#!/bin/bash
    22
     3MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
     4PACKAGE="ISSM" # Name of directory to copy distributable files to
    35TARBALL_NAME='ISSM-Win10-64'
    46TARBALL=$TARBALL_NAME.tar.gz
    5 MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
    67
    78# Source Windows environment
    … …  
    1112echo "Cleaning up existing assets"
    1213cd $ISSM_DIR
    13 rm -rf trunk
    14 mkdir trunk
     14rm -rf $PACKAGE
     15mkdir $PACKAGE
    1516
    1617# Add/modify required binaries
    … …  
    2627echo "Copying gmsh to bin"
    2728if [ -f ../externalpackages/gmsh/install/gmsh.exe ]; then
    28         cp ../externalpackages/gmsh/install/gmsh.exe .
     29        cp ../externalpackages/gmsh/install/gmsh.exe ./gmsh
    2930else
    3031        echo "gmsh not found"
    3132fi
    3233
    33 # Copy gmt to trunk
     34# Copy gmt to package
    3435# NOTE: The following assumes the precompiled version of gmt
    3536echo "Moving gmt to externalpackages"
    3637if [ -f $ISSM_DIR/externalpackages/gmt/install/bin/gmt ]; then
    37         mkdir $ISSM_DIR/trunk/externalpackages
    38         mkdir $ISSM_DIR/trunk/externalpackages/gmt
    39         cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/trunk/externalpackages/gmt
     38        mkdir $ISSM_DIR/$PACKAGE/externalpackages
     39        mkdir $ISSM_DIR/$PACKAGE/externalpackages/gmt
     40        cp -a $ISSM_DIR/externalpackages/gmt/install $ISSM_DIR/$PACKAGE/externalpackages/gmt/install
    4041else
    4142        echo "gmt not found"
    … …  
    6768cd $ISSM_DIR
    6869rm -f $TARBALL
    69 cp -rf bin lib test examples scripts trunk/
     70cp -rf bin lib test examples scripts $PACKAGE/
    7071
    7172# Create link to gmt from bin
    7273# NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
    73 if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
    74         cd $ISSM_DIR/trunk/bin
    75         ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt
     74if [ -f $ISSM_DIR/$PACKAGE/externalpackages/gmt/bin/gmt ]; then
     75        cd $ISSM_DIR/$PACKAGE/bin
     76        ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt.exe
    7677fi
    7778
    7879cd $ISSM_DIR
    79 tar -czf $TARBALL trunk
     80tar -czf $TARBALL $PACKAGE
    8081ls -lah $TARBALL
    8182
Note: See TracChangeset for help on using the changeset viewer.