Changeset 27096


Ignore:
Timestamp:
06/22/22 16:18:26 (3 years ago)
Author:
jdquinn
Message:

BUG: Packaging PROJ share directory

Location:
issm/trunk-jpl/packagers
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r27089 r27096  
    121121cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
    122122
     123echo "Moving PROJ assets to share/"
     124if [ -d ${ISSM_DIR}/externalpackages/proj/install/share/proj ]; then
     125        mkdir ${ISSM_DIR}/share 2> /dev/null
     126        cp ${ISSM_DIR}/externalpackages/proj/install/share/proj ${ISSM_DIR}/share
     127else
     128        echo "PROJ not found"
     129        exit 1
     130fi
     131
    123132# Run tests
    124133if [ ${skip_tests} -eq 0 ]; then

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

    r27089 r27096  
    106106
    107107echo "Moving PROJ assets to share/"
    108 if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
     108if [ -d ${ISSM_DIR}/externalpackages/proj/install/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/proj/install/share/proj ${ISSM_DIR}/share
    111111else
    112112        echo "PROJ not found"

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

    r27089 r27096  
    106106
    107107echo "Moving PROJ assets to share/"
    108 if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
     108if [ -d ${ISSM_DIR}/externalpackages/proj/install/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/proj/install/share/proj ${ISSM_DIR}/share
    111111else
    112112        echo "PROJ not found"

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

    r27089 r27096  
    127127
    128128echo "Moving PROJ assets to share/"
    129 if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
     129if [ -d ${ISSM_DIR}/externalpackages/proj/install/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/proj/install/share/proj ${ISSM_DIR}/share
    132132else
    133133        echo "PROJ not found"

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

    r27089 r27096  
    119119
    120120echo "Moving PROJ assets to share/"
    121 if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
     121if [ -d ${ISSM_DIR}/externalpackages/proj/install/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/proj/install/share/proj ${ISSM_DIR}/share
    124124else
    125125        echo "PROJ not found"

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

    r27089 r27096  
    119119
    120120echo "Moving PROJ assets to share/"
    121 if [ -d ${ISSM_DIR}/externalpackages/share/proj ]; then
     121if [ -d ${ISSM_DIR}/externalpackages/proj/install/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/proj/install/share/proj ${ISSM_DIR}/share
    124124else
    125125        echo "PROJ not found"
Note: See TracChangeset for help on using the changeset viewer.