From 35a1605b3f5359759270e16c247ade3e4fb64f7f Mon Sep 17 00:00:00 2001
From: Robert McIntosh <261477+rwmcintosh@users.noreply.github.com>
Date: Fri, 14 Feb 2025 09:55:08 -0500
Subject: [PATCH] Fixes #11 Use separate nuspec files for different
 architechtures (#12)

* Fixes #11 Use separate nuspec files for different architechtures

* change package name
---
 CVODES_MacOSArm64.nuspec                      | 24 +++++++++++++++++++
 CVODES_MacOS.nuspec => CVODES_MacOSx64.nuspec |  2 +-
 buildNix.sh                                   | 15 ++++++++----
 createNugetPackage_Nix.sh                     |  8 ++++++-
 4 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 CVODES_MacOSArm64.nuspec
 rename CVODES_MacOS.nuspec => CVODES_MacOSx64.nuspec (97%)

diff --git a/CVODES_MacOSArm64.nuspec b/CVODES_MacOSArm64.nuspec
new file mode 100644
index 0000000..f339b9d
--- /dev/null
+++ b/CVODES_MacOSArm64.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>    
+    <description>Sundials CVODES Solver built for the Open Systems Pharmacology Suite.</description>
+    <id>CVODES.MacOSArm64</id>
+    <version>$version$</version>
+    <title>CVODES</title>
+    <authors>Open-Systems-Pharmacology</authors>
+    <owners>Open-Systems-Pharmacology</owners>
+    <projectUrl>https://github.com/Open-Systems-Pharmacology/CVODES</projectUrl>
+    <licenseUrl>https://computing.llnl.gov/projects/sundials/license</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>Copyright (c) 2002-2019, Lawrence Livermore National Security and Southern Methodist University</copyright>
+    <tags>open-systems-pharmacology native</tags>
+  </metadata>
+  <files>
+    <file src="src/CVODES/include/**/*.h" target="CVODES/include" />
+	<file src="BuildCVODES_MacOS/Release/ARM64/include/sundials/*.h" target="CVODES/include/sundials" />
+
+	<file src="Dist/MacOS/Release/ARM64/*.a" target="CVODES/bin/native/ARM64/Release" />
+	<file src="Dist/MacOS/Debug/ARM64/*.a" target="CVODES/bin/native/ARM64/Debug" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/CVODES_MacOS.nuspec b/CVODES_MacOSx64.nuspec
similarity index 97%
rename from CVODES_MacOS.nuspec
rename to CVODES_MacOSx64.nuspec
index f68be47..25a40d8 100644
--- a/CVODES_MacOS.nuspec
+++ b/CVODES_MacOSx64.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>    
     <description>Sundials CVODES Solver built for the Open Systems Pharmacology Suite.</description>
-    <id>CVODES.MacOS</id>
+    <id>CVODES.MacOSx64</id>
     <version>$version$</version>
     <title>CVODES</title>
     <authors>Open-Systems-Pharmacology</authors>
diff --git a/buildNix.sh b/buildNix.sh
index a63b3b0..b3361c9 100755
--- a/buildNix.sh
+++ b/buildNix.sh
@@ -27,13 +27,20 @@ else
     Platform=Ubuntu22
 fi
 
+if [ "$(uname -m)" == "arm64" ]; 
+then
+    Arch=ARM64
+else
+    Arch=x64
+fi
+
 for BuildType in Debug Release
 do
-    cmake -BBuildCVODES_${Platform}/${BuildType}/x64/ -Hsrc/CVODES/ -DCMAKE_BUILD_TYPE=${BuildType} -DEXAMPLES_ENABLE_C=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DENABLE_KLU=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DKLU_INCLUDE_DIR=BuildSuiteSparse/include/ -DKLU_LIBRARY_DIR=BuildSuiteSparse/lib64/
-    make -C BuildCVODES_${Platform}/${BuildType}/x64/
+    cmake -BBuildCVODES_${Platform}/${BuildType}/${Arch}/ -Hsrc/CVODES/ -DCMAKE_BUILD_TYPE=${BuildType} -DEXAMPLES_ENABLE_C=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DENABLE_KLU=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DKLU_INCLUDE_DIR=BuildSuiteSparse/include/ -DKLU_LIBRARY_DIR=BuildSuiteSparse/lib64/
+    make -C BuildCVODES_${Platform}/${BuildType}/${Arch}/
     
-    mkdir -p Dist/${Platform}/${BuildType}/x64
-    find ./BuildCVODES_${Platform} -name lib*.a -exec cp {} Dist/${Platform}/${BuildType}/x64/ \;
+    mkdir -p Dist/${Platform}/${BuildType}/${Arch}
+    find ./BuildCVODES_${Platform} -name lib*.a -exec cp {} Dist/${Platform}/${BuildType}/${Arch}/ \;
 done
 
 
diff --git a/createNugetPackage_Nix.sh b/createNugetPackage_Nix.sh
index abd9a06..2301e12 100755
--- a/createNugetPackage_Nix.sh
+++ b/createNugetPackage_Nix.sh
@@ -8,7 +8,13 @@ fi
 
 if [ "$(uname)" == "Darwin" ]; 
 then
-    nuget pack CVODES_MacOS.nuspec -version $1
+    if [ "$(uname -m)" == "arm64" ]; 
+    then
+        nuget pack CVODES_MacOSArm64.nuspec -version $1
+    else
+        nuget pack CVODES_MacOSx64.nuspec -version $1
+    fi
+    
 else
     nuget pack CVODES_Ubuntu22.nuspec -version $1
 fi
\ No newline at end of file