Changeset 23385


Ignore:
Timestamp:
10/04/18 17:11:03 (6 years ago)
Author:
jdquinn
Message:

CHG: Modified Windows 10 build and packager to use precompiled versions of gmsh and gmt

Location:
issm/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/externalpackages/gmsh/install-win64-precompiled.sh

    r23364 r23385  
    33
    44# Set gmsh version
    5 GMSH_VER="3.0.5"
     5VER="3.0.5"
    66
    77# Set tarball name
    8 GMSH_TARBALL_NAME="gmsh-${GMSH_VER}-win64-precompiled"
     8TARBALL_NAME="gmsh-${VER}-win64-precompiled"
     9TARBALL=${TARBALL_NAME}.tar.gz
    910
    1011# Clean up from previous installation
    11 rm -f $GMSH_TARBALL_NAME.tar.gz
    12 rm -rf install src
     12rm -rf install
    1313
    1414# Download Windows 64-bit precompiled gmsh from ISSM server
    15 $ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${GMSH_TARBALL_NAME}.tar.gz" "${GMSH_TARBALL_NAME}.tar.gz"
     15$ISSM_DIR/scripts/DownloadExternalPackage.py "http://issm.jpl.nasa.gov/files/externalpackages/${TARBALL}" "${TARBALL}"
    1616
    1717# Untar gmsh
    18 tar -xvzf $GMSH_TARBALL_NAME.tar.gz
     18tar -xvzf $TARBALL
    1919
    20 # Copy gmsh to path expected by packager
    21 mkdir install
    22 cp gmsh.exe install
    23 rm gmsh.exe
     20# Rename untarred dir
     21mv $TARBALL_NAME install
     22
     23# Clean up
     24rm -f $TARBALL

  • issm/trunk/jenkins/windows_static

    r23364 r23385  
    99#ISSM CONFIGURATION
    1010ISSM_CONFIG='--prefix=$ISSM_DIR \
    11         --with-vendor=MSVC-Win64  \
    12         --with-cxxoptflags='-fp:strict' \
    1311        --disable-static \
     12        --enable-standalone-executables \
    1413        --enable-standalone-libraries \
    15         --with-fortran=no  \
     14        --with-matlab-dir=$MATLAB_PATH \
     15        --with-vendor=MSVC-Win64 \
     16        --with-fortran=no \
    1617        --without-GiaIvins \
    1718        --without-Love \
    1819        --without-kriging \
    1920        --without-kml \
    20         --with-matlab-dir=$MATLAB_PATH \
    21         --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
    22         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
     21        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
     22        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib  \
     23        --with-mpi-libdir=$ISSM_DIR/externalpackages/petsc/install/lib \
     24        --with-mpi-libflags="-Wl,libpetsc.lib" \
    2325        --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
    24         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
    25         --with-mpi-libdir="$ISSM_DIR/externalpackages/petsc/install/lib" \
    26         --with-mpi-libflags="-Wl,libpetsc.lib" \
     26        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
     27        --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
    2728        --with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/petsc/mpiuni" \
    28         --enable-development \
    29         --enable-debugging '
     29        --with-cxxoptflags="-fp:strict"'
    3030
    3131#PYTHON and MATLAB testing
    … …  
    3939#List of external pakages to be installed and their installation scripts
    4040EXTERNALPACKAGES="autotools   install-win.sh
    41                                                 petsc       install-3.6-win10.sh
    42                                                 metis       install-4.0-win10.sh
    43                                                 triangle    install-win10.sh
    44                                                 gmsh            install-win64-precompiled.sh
    45                                                 shell2junit install.sh"
     41                                        cmake           install.sh
     42                                        petsc       install-3.6-win10.sh
     43                                        metis       install-4.0-win10.sh
     44                                        triangle    install-win10.sh
     45                                        math77          install.sh
     46                                        gmt                     install-win64-precompiled.sh
     47                                        gmsh            install-win64-precompiled.sh
     48                                        shell2junit install.sh"
    4649
    4750#-----------------#

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

    r23364 r23385  
    11#!/bin/bash
    22
     3TARBALL_NAME='ISSM-Win10-64'
     4TARBALL=$TARBALL_NAME.tar.gz
    35MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
    46
    … …  
    68source $ISSM_DIR/externalpackages/windows/windows_environment.sh
    79
     10# Clean up from previous packaging
     11echo "Cleaning up existing assets"
     12cd $ISSM_DIR
     13rm -rf trunk
     14mkdir trunk
     15
     16# Add/modify required binaries
     17cd $ISSM_DIR/bin
     18
    819echo "Making generic_static.m work like generic.m"
    9 cd $ISSM_DIR/bin
    1020cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    1121
    1222echo "Copying scripts from /src to /bin"
    13 echo "----------------------------------"
    1423rm $ISSM_DIR/bin/*.m
    1524find $ISSM_DIR/src/m -name '*.m' | xargs cp -t $ISSM_DIR/bin
    16 ls $ISSM_DIR/bin
    17 echo "----------------------------------"
    1825
    1926echo "Copying gmsh to bin"
    … …  
    2431fi
    2532
     33# Copy gmt to trunk
     34# NOTE: The following assumes the precompiled version of gmt
     35echo "Moving gmt to externalpackages"
     36if [ -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
     40else
     41        echo "gmt not found"
     42fi
     43
    2644# Check that test 101 runs
    2745cd $ISSM_DIR/test/NightlyRun
    2846rm matlab.log
    29 
    3047$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
    3148
    … …  
    4764
    4865# Create tarball
    49 TARBALL_NAME=ISSM-Win10-64.tar.gz
     66echo "Creating tarball: ${TARBALL_NAME}"
     67cd $ISSM_DIR
     68rm -f $TARBALL
     69cp -rf bin lib test examples scripts trunk/
     70
     71# Create link to gmt from bin
     72# NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
     73if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
     74        cd $ISSM_DIR/trunk/bin
     75        ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt
     76fi
    5077
    5178cd $ISSM_DIR
    52 rm $TARBALL_NAME
    53 rm -rf trunk
    54 mkdir trunk
    55 
    56 echo "Creating tarball: ${TARBALL_NAME}"
    57 cp -rf bin lib test examples scripts trunk/
    58 tar -czf $TARBALL_NAME trunk
    59 ls -lah $TARBALL_NAME
     79tar -czf $TARBALL trunk
     80ls -lah $TARBALL
    6081
    6182# Ship binaries to website
    … …  
    7798ssh-add ~/.ssh/win_bins-geidi_prime_to_ross
    7899
    79 scp $TARBALL_NAME jenkins@ross.ics.uci.edu:/var/www/html/$TARBALL_NAME
     100scp $TARBALL jenkins@ross.ics.uci.edu:/var/www/html/$TARBALL
    80101
    81102if [ $? -ne 0 ]; then
Note: See TracChangeset for help on using the changeset viewer.