Changeset 27089


Ignore:
Timestamp:
06/22/22 11:11:51 (3 years ago)
Author:
jdquinn
Message:

CHG: Packaging PROJ share directory

Location:
issm/trunk-jpl
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r27086 r27089  
    110110
    111111echo "Moving PROJ assets to share/"
    112 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     112if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    113113        mkdir ${ISSM_DIR}/share 2> /dev/null
    114         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     114        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    115115else
    116116        echo "PROJ not found"
    … …  
    128128
    129129        # Run tests, redirecting output to logfile and suppressing output to console
    130         ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
     130        ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
    131131
    132132        # Check that MATLAB did not exit in error

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh

    r27086 r27089  
    106106
    107107echo "Moving PROJ assets to share/"
    108 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     108if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    109109        mkdir ${ISSM_DIR}/share 2> /dev/null
    110         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     110        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    111111else
    112112        echo "PROJ not found"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

    r27086 r27089  
    106106
    107107echo "Moving PROJ assets to share/"
    108 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     108if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    109109        mkdir ${ISSM_DIR}/share 2> /dev/null
    110         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     110        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    111111else
    112112        echo "PROJ not found"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

    r27086 r27089  
    127127
    128128echo "Moving PROJ assets to share/"
    129 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     129if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    130130        mkdir ${ISSM_DIR}/share 2> /dev/null
    131         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     131        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    132132else
    133133        echo "PROJ not found"
    … …  
    142142
    143143        # Run tests, redirecting output to logfile and suppressing output to console
    144         ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
     144        ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -nojvm -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib ${ISSM_DIR}/share; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" &> matlab.log
    145145
    146146        # Check that MATLAB did not exit in error

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-2.sh

    r27086 r27089  
    119119
    120120echo "Moving PROJ assets to share/"
    121 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     121if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    122122        mkdir ${ISSM_DIR}/share 2> /dev/null
    123         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     123        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    124124else
    125125        echo "PROJ not found"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

    r27086 r27089  
    119119
    120120echo "Moving PROJ assets to share/"
    121 if [ -f ${ISSM_DIR}/externalpackages/share/proj ]; then
     121if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
    122122        mkdir ${ISSM_DIR}/share 2> /dev/null
    123         cp ${ISSM_DIR}/externalpackages/share/proj $ISSM_DIR/share
     123        cp ${ISSM_DIR}/externalpackages/share/proj ${ISSM_DIR}/share
    124124else
    125125        echo "PROJ not found"

  • issm/trunk-jpl/src/m/modules/CoordTransform.m

    r26959 r27089  
    3131end
    3232
     33% If this function is called from within one of our distributable packages, set
     34% the 'PROJ_LIB' environment variable so that the PROJ binary can find the
     35% assets it needs
     36if isdir('share/proj')
     37        setenv('PROJ_LIB', what('share/proj').path);
     38end
     39
    3340% Call mex module
    3441[xout, yout] = CoordTransform_matlab(xin,yin,projin,projout);
Note: See TracChangeset for help on using the changeset viewer.