From 4ac2275ac31edb928c2103a0f46c6a44231d5b14 Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:29:30 -0400
Subject: [PATCH] More tweaks to the build scripts to get the right libraries
 into the right place

---
 buildscripts/build_dependencies.sh   | 30 ++++++----------------------
 buildscripts/build_hdf5.sh           |  3 ++-
 buildscripts/build_netcdf-c.sh       |  5 +----
 buildscripts/build_netcdf-fortran.sh |  3 ++-
 buildscripts/build_swiftest.sh       |  9 ++++++++-
 buildscripts/build_zlib.sh           |  2 +-
 6 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh
index f1eb625c3..5fc544450 100755
--- a/buildscripts/build_dependencies.sh
+++ b/buildscripts/build_dependencies.sh
@@ -67,33 +67,15 @@ printf "Installing to ${PREFIX}\n"
 printf "\n"
 
 set -e
-if [ ! -f ${PREFIX}/lib/libz.a ]; then
-    ${SCRIPT_DIR}/build_zlib.sh ${ARGS}
-else
-    echo "Found: ${PREFIX}/lib/libz.a"
-fi
-
-if [ ! -f ${PREFIX}/lib/libhdf5.a ]; then
-    ${SCRIPT_DIR}/build_hdf5.sh ${ARGS}
-else
-    echo "Found: ${PREFIX}/lib/libhdf5.a"
-fi
-
-
-if [ ! -f ${PREFIX}/lib/libnetcdf.a ]; then
-    ${SCRIPT_DIR}/build_netcdf-c.sh ${ARGS}
-else
-    echo "Found: ${PREFIX}/lib/libnetcdf.a" 
-fi
-
-if [ ! -f ${PREFIX}/lib/libnetcdff.a ]; then
-    ${SCRIPT_DIR}/build_netcdf-fortran.sh ${ARGS}
-else
-    echo "Found: ${PREFIX}/lib/libnetcdff.a"
-fi
+${SCRIPT_DIR}/build_zlib.sh ${ARGS}
+${SCRIPT_DIR}/build_hdf5.sh ${ARGS}
+${SCRIPT_DIR}/build_netcdf-c.sh ${ARGS}
+${SCRIPT_DIR}/build_netcdf-fortran.sh ${ARGS}
 
 printf "\n"
 printf "*********************************************************\n"
 printf "*             DEPENDENCIES ARE BUILT                    *\n"
 printf "*********************************************************\n"
 printf "Dependencys are installed to: ${PREFIX}\n\n"
+
+
diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh
index fffd91b47..072c7b689 100755
--- a/buildscripts/build_hdf5.sh
+++ b/buildscripts/build_hdf5.sh
@@ -35,7 +35,6 @@ if [ $OS = "MacOSX" ]; then
       printf "echo arm-apple-darwin" > bin/config.sub 
    fi
 fi
-#COPTS="--disable-shared --enable-build-mode=production --enable-tests=no --enable-tools=no --disable-fortran --disable-java --disable-cxx --prefix=${PREFIX} --with-zlib=${PREFIX}"
 COPTS="--enable-build-mode=production --enable-tests=no --enable-tools=no --disable-fortran --disable-java --disable-cxx --prefix=${PREFIX} --with-zlib=${PREFIX}"
 ./configure ${COPTS}
 make 
@@ -45,6 +44,8 @@ else
     sudo make install
 fi
 
+rsync -va ${PREFIX}/lib/libhdf5* ${ROOT_DIR}/lib/
+
 if [ $? -ne 0 ]; then
    printf "hdf5 could not be compiled.\n"
    exit 1
diff --git a/buildscripts/build_netcdf-c.sh b/buildscripts/build_netcdf-c.sh
index 9fe7a913e..fc17313c6 100755
--- a/buildscripts/build_netcdf-c.sh
+++ b/buildscripts/build_netcdf-c.sh
@@ -30,11 +30,7 @@ printf "HDF5_ROOT: ${HDF5_ROOT}\n"
 printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/netcdf-c-*
-#COPTS="--disable-shared --disable-dap --disable-byterange --disable-testsets --prefix=${PREFIX}"
 COPTS="--disable-testsets --prefix=${PREFIX}"
-#if [ !  $OS = "MacOSX" ]; then
-#    COPTS="${COPTS} --disable-libxml2"
-#fi
 printf "COPTS: ${COPTS}\n"
 ./configure $COPTS
 make && make check 
@@ -44,6 +40,7 @@ if [ -w ${PREFIX} ]; then
 else
     sudo make install
 fi
+rsync -va ${PREFIX}/lib/libnetcdf* ${ROOT_DIR}/lib/
 
 if [ $? -ne 0 ]; then
    printf "netcdf-c could not be compiled."\n
diff --git a/buildscripts/build_netcdf-fortran.sh b/buildscripts/build_netcdf-fortran.sh
index cb2ad8a8e..2f51f9813 100755
--- a/buildscripts/build_netcdf-fortran.sh
+++ b/buildscripts/build_netcdf-fortran.sh
@@ -30,7 +30,6 @@ printf "LDFLAGS: ${LDFLAGS}\n"
 printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/netcdf-fortran-*
-#./configure --disable-shared --with-pic --disable-zstandard-plugin --enable-large-file-tests=no  --enable-filter-test=no --prefix=${PREFIX}  
 ./configure --enable-large-file-tests=no  --enable-filter-test=no --prefix=${PREFIX}  
 make && make check i
 if [ -w ${PREFIX} ]; then
@@ -38,6 +37,8 @@ if [ -w ${PREFIX} ]; then
 else
     sudo make install
 fi
+rsync -a ${PREFIX}/lib/libnetcdff* ${ROOT_DIR}/lib/
+rsync -a ${PREFIX}/include/netcdf.mod ${ROOT_DIR}/include/
 
 if [ $? -ne 0 ]; then
    printf "netcdf-fortran could not be compiled.\n"
diff --git a/buildscripts/build_swiftest.sh b/buildscripts/build_swiftest.sh
index 7cc9130ff..10acbfae7 100755
--- a/buildscripts/build_swiftest.sh
+++ b/buildscripts/build_swiftest.sh
@@ -32,13 +32,20 @@ read -rsn1 -p"Press any key to continue";echo
 
 ${SCRIPT_DIR}/build_dependencies.sh ${ARGS}
 
-
 if [ $OS = "Linux" ]; then
     cibuildwheel --platform linux
 else
     SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=ON -DUSE_SIMD=OFF"
     SKBUILD_CONFIGURE_OPTIONS="${SKBUILD_CONFIGURE_OPTIONS} -DMACHINE_CODE_VALUE=\"generic\""
     OMPROOT=${DEVTOOLDIR}/MacOSX${MACOSX_DEPLOYMENT_TARGET}/${ARCH}/usr/local
+    rsync -a ${OMPROOT}/lib/libgfortran*dylib ${ROOT_DIR}/lib/
+    rsync -a ${OMPROOT}/lib/libgomp*dylib ${ROOT_DIR}/lib/
+    rsync -a ${OMPROOT}/lib/libomp*dylib ${ROOT_DIR}/lib/
+    rsync -a ${OMPROOT}/lib/libquadmath*dylib ${ROOT_DIR}/lib/
+
+    NETCDF_FORTRAN_HOME=${ROOT_DIR}
+    NETCDF_INCLUDE=${ROOT_DIR}/include
+
     CPPFLAGS="${CPPFLAGS} -Xclang -fopenmp"
     LIBS="${LIBS} -lomp"
     LDFLAGS="-Wl,-rpath,${OMPROOT}/lib -Wl,-rpath,${ROOT_DIR}/lib" 
diff --git a/buildscripts/build_zlib.sh b/buildscripts/build_zlib.sh
index 928d07fe3..2a7313a13 100755
--- a/buildscripts/build_zlib.sh
+++ b/buildscripts/build_zlib.sh
@@ -27,7 +27,6 @@ printf "LDFLAGS: ${LDFLAGS}\n"
 printf "*********************************************************\n"
 
 cd ${DEPENDENCY_DIR}/zlib-*
-#./configure --prefix=${PREFIX} --static 
 ./configure --prefix=${PREFIX}
 make 
 if [ -w ${PREFIX} ]; then
@@ -35,6 +34,7 @@ if [ -w ${PREFIX} ]; then
 else
     sudo make install
 fi
+rsync -va ${PREFIX}/lib/libz* ${ROOT_DIR}/lib/
 
 if [ $? -ne 0 ]; then
    printf "zlib could not be compiled.\n"