build: Update binaries with structure condusive to multi-platform Dar…

…win builds
dbhart · Dec 14, 2024 · caa0af2 · caa0af2
1 parent be18e35
commit caa0af2
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 15 deletions.
diff --git a/wntr/epanet/Darwin/libepanet.dylib b/wntr/epanet/Darwin/libepanet.dylib
diff --git a/wntr/epanet/Darwin/libepanet2.dylib b/wntr/epanet/Darwin/libepanet2.dylib
diff --git a/wntr/epanet/Darwin/libepanet22.dylib b/wntr/epanet/Darwin/libepanet22.dylib
diff --git a/wntr/epanet/Linux/libepanet22_amd64.so b/wntr/epanet/Linux/libepanet22_amd64.so
diff --git a/wntr/epanet/Linux/libepanet2_amd64.so b/wntr/epanet/Linux/libepanet2_amd64.so
diff --git a/wntr/epanet/Windows/epanet2.dll b/wntr/epanet/Windows/epanet2.dll
diff --git a/wntr/epanet/Windows/epanet22_amd64.dll b/wntr/epanet/Windows/epanet22_amd64.dll
diff --git a/wntr/epanet/Windows/epanet22_win32.dll b/wntr/epanet/Windows/epanet22_win32.dll
diff --git a/wntr/epanet/Windows/epanet2_amd64.dll b/wntr/epanet/Windows/epanet2_amd64.dll
diff --git a/wntr/epanet/Windows/epanetmsx.dll b/wntr/epanet/Windows/epanetmsx.dll
diff --git a/wntr/epanet/libepanet/darwin-arm/libepanet2.dylib b/wntr/epanet/libepanet/darwin-arm/libepanet2.dylib
diff --git a/wntr/epanet/Darwin/libepanetmsx.dylib → ...t/libepanet/darwin-arm/libepanetmsx.dylib b/wntr/epanet/Darwin/libepanetmsx.dylib → ...t/libepanet/darwin-arm/libepanetmsx.dylib
diff --git a/wntr/epanet/libepanet/darwin-x64/libepanet2.dylib b/wntr/epanet/libepanet/darwin-x64/libepanet2.dylib
diff --git a/wntr/epanet/libepanet/darwin-x64/libepanetmsx.dylib b/wntr/epanet/libepanet/darwin-x64/libepanetmsx.dylib
diff --git a/wntr/epanet/Linux/libepanet2.so → .../epanet/libepanet/linux-x64/libepanet2.so b/wntr/epanet/Linux/libepanet2.so → .../epanet/libepanet/linux-x64/libepanet2.so
diff --git a/wntr/epanet/Linux/libepanetmsx.so → ...panet/libepanet/linux-x64/libepanetmsx.so b/wntr/epanet/Linux/libepanetmsx.so → ...panet/libepanet/linux-x64/libepanetmsx.so
diff --git a/wntr/epanet/libepanet/windows-x64/epanet2.dll b/wntr/epanet/libepanet/windows-x64/epanet2.dll
diff --git a/wntr/epanet/libepanet/windows-x64/epanetmsx.dll b/wntr/epanet/libepanet/windows-x64/epanetmsx.dll
diff --git a/wntr/epanet/msx/toolkit.py b/wntr/epanet/msx/toolkit.py
@@ -9,6 +9,7 @@
     licensed under the BSD license. See LICENSE.md for details.
 """
 import ctypes
+import logging
 import os
 import os.path
 import platform
@@ -20,29 +21,35 @@
 from wntr.epanet.msx.enums import TkObjectType, TkSourceType
 
 from ..toolkit import ENepanet
-from .exceptions import MSX_ERROR_CODES, EpanetMsxException, MSXKeyError, MSXValueError
+from .exceptions import (MSX_ERROR_CODES, EpanetMsxException, MSXKeyError,
+                         MSXValueError)
+
+logger = logging.getLogger(__name__)
 
 epanet_toolkit = "wntr.epanet.toolkit"
 
 if os.name in ["nt", "dos"]:
-    libepanet = resource_filename(__name__, "../Windows/epanet2.dll")
-    libmsx = resource_filename(__name__, "../Windows/epanetmsx.dll")
+    libepanet = resource_filename(__name__, "../libepanet/windows-x64/epanet2.dll")
+    libmsx = resource_filename(__name__, "../libepanet/windows-x64/epanetmsx.dll")
 elif sys.platform in ["darwin"]:
-    libepanet = resource_filename(__name__, "../Darwin/libepanet2.dylib")
-    libmsx = resource_filename(__name__, "../Darwin/libepanetmsx.dylib")
+    if 'arm' in platform.platform().lower():
+        libepanet = resource_filename(__name__, "../libepanet/darwin-arm/libepanet.dylib")
+        libmsx = resource_filename(__name__, "../libepanet/darwin-arm/libepanetmsx.dylib")
+    else:
+        libepanet = resource_filename(__name__, "../libepanet/darwin-x64/libepanet.dylib")
+        libmsx = resource_filename(__name__, "../libepanet/darwin-x64/libepanetmsx.dylib")
 else:
-    libepanet = resource_filename(__name__, "../Linux/libepanet2.so")
-    libmsx = resource_filename(__name__, "../Linux/libepanetmsx.so")
+    libepanet = resource_filename(__name__, "../libepanet/linux-x64/libepanet2.so")
+    libmsx = resource_filename(__name__, "../libepanet/linux-x64/epanetmsx.dll")
 
 dylib_dir = os.environ.get('DYLD_FALLBACK_LIBRARY_PATH','')
 if dylib_dir != '':
-    dylib_dir = dylib_dir + ':' + resource_filename(__name__, "../Darwin")
+    if 'arm' in platform.platform().lower():
+        dylib_dir = dylib_dir + ':' + resource_filename(__name__, "../libepanet/darwin-arm")
+    else:
+        dylib_dir = dylib_dir + ':' + resource_filename(__name__, "../libepanet/darwin-x64")
     os.environ['DYLD_FALLBACK_LIBRARY_PATH'] = dylib_dir
 
-import logging
-
-logger = logging.getLogger(__name__)
-
 
 class MSXepanet(ENepanet):
     def __init__(self, inpfile="", rptfile="", binfile="", msxfile=""):

diff --git a/wntr/epanet/toolkit.py b/wntr/epanet/toolkit.py
@@ -20,11 +20,14 @@
 epanet_toolkit = "wntr.epanet.toolkit"
 
 if os.name in ["nt", "dos"]:
-    libepanet = resource_filename(__name__, "Windows/epanet2.dll")
+    libepanet = resource_filename(__name__, "libepanet/windows-x64/epanet2.dll")
 elif sys.platform in ["darwin"]:
-    libepanet = resource_filename(__name__, "Darwin/libepanet.dylib")
+    if 'arm' in platform.platform().lower():
+        libepanet = resource_filename(__name__, "libepanet/darwin-arm/libepanet.dylib")
+    else:
+        libepanet = resource_filename(__name__, "libepanet/darwin-x64/libepanet.dylib")
 else:
-    libepanet = resource_filename(__name__, "Linux/libepanet2.so")
+    libepanet = resource_filename(__name__, "libepanet/linux-x64/libepanet2.so")
 
 
 def ENgetwarning(code, sec=-1):