Changeset 28016


Ignore:
Timestamp:
11/17/23 11:16:01 (16 months ago)
Author:
jdquinn
Message:

BUG: Corrected warnings under Windows that were causing runtime MATLAB crash; cleanup

Location:
issm/trunk-jpl/externalpackages/triangle
Files:
3 added
8 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/triangle/install-linux-javascript.sh

    r27046 r28016  
    1919
    2020# Cleanup
    21 rm -rf ${PREFIX} src
     21rm -rf ${PREFIX}
    2222mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/share src
    2323
    … …  
    4141cp src/triangle.o ${PREFIX}/share
    4242cp src/triangle.h ${PREFIX}/include
     43
     44# Cleanup
     45rm -rf src

  • issm/trunk-jpl/externalpackages/triangle/install-linux-static.sh

    r25861 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/linux/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-linux.sh

    r25861 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/linux/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-mac-static.sh

    r25860 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/mac/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-mac.sh

    r25860 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/mac/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-pleiades.sh

    r25876 r28016  
    55# Constants
    66#
    7 INSTALL_DIR="install"
     7export PREFIX="install"
    88
    99# Cleanup
    10 rm -rf ${INSTALL_DIR} src
    11 mkdir ${INSTALL_DIR} ${INSTALL_DIR}/include ${INSTALL_DIR}/lib src
     10rm -rf ${PREFIX}
     11mkdir ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    1313# Download source
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/linux/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile
    … …  
    2831# Install
    2932cd ..
    30 cp src/libtriangle.* ${INSTALL_DIR}/lib
    31 cp src/triangle.h ${INSTALL_DIR}/include
     33cp src/libtriangle.* ${PREFIX}/lib
     34cp src/triangle.h ${PREFIX}/include
    3235
    3336# Cleanup

  • issm/trunk-jpl/externalpackages/triangle/install-win-msys2-gcc.sh

    r26034 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/win/msys2/gcc/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-win-msys2-mingw-static.sh

    r27944 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/win/msys2/mingw64/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile

  • issm/trunk-jpl/externalpackages/triangle/install-win-msys2-mingw.sh

    r26034 r28016  
    88
    99# Cleanup
    10 rm -rf ${PREFIX} src
     10rm -rf ${PREFIX}
    1111mkdir -p ${PREFIX} ${PREFIX}/include ${PREFIX}/lib src
    1212
    … …  
    1919# Copy customized source files to 'src' directory
    2020cp configs/makefile src
    21 cp configs/triangle.h src
    2221cp configs/win/msys2/mingw64/configure.make src
     22
     23# Patch source
     24patch src/triangle.c < configs/triangle.c.patch
     25patch src/triangle.h < configs/triangle.h.patch
    2326
    2427# Compile
Note: See TracChangeset for help on using the changeset viewer.