move sdk files into arch subfolders (#29)

* move files into arch subfolders * unignore * move windows * update manifest * rename windows folder * whoops
tlambert03 · Nov 12, 2021 · 891b1ba · 891b1ba
1 parent 1e2d45b
commit 891b1ba
Show file tree

Hide file tree

Showing 26 changed files with 12 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -115,4 +115,5 @@ src/nd2/_sdk/latest.c
 
 # allow these
 !src/sdk/**/*.so
+!src/sdk/**/lib/
 !src/sdk/**/*.a
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,13 +1,15 @@
 include src/nd2/py.typed
-recursive-include src/nd2 *.pyi
+recursive-include src/nd2 *.py *.py[ix] *.pxd
 
 graft src/sdk/*/lib
 graft src/sdk/*/include
+recursive-include src/sdk *.a *.h *.lib *.so *.txt LICENSE
 
-exclude .pre-commit-config.yaml .coveragerc
+exclude .pre-commit-config.yaml .coveragerc Makefile
 recursive-exclude tests *
 recursive-exclude .github *
 recursive-exclude scripts *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 recursive-exclude * *.c
+exclude Makefile
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,5 +20,5 @@ repair-wheel-command = [
 [tool.cibuildwheel.linux]
 before-all = [
     "apt-get update && apt-get install -y libtiff5-dev",
-    "cp {project}/src/sdk/Linux/lib/* /lib",
+    "cp {project}/src/sdk/Linux/x86_64/lib/* /lib",
 ]
diff --git a/setup.cfg b/setup.cfg
@@ -96,6 +96,10 @@ filterwarnings =
     error
     ignore:The distutils package is deprecated::
 
+[check-manifest]
+ignore =
+    src/nd2/_version.py
+
 [mypy]
 files = src/nd2
 warn_unused_configs = True

diff --git a/setup.py b/setup.py
@@ -7,11 +7,11 @@
 from setuptools import Extension, setup
 
 SYSTEM = platform.system()
-SDK = Path("src/sdk") / SYSTEM
+PLATFORM = platform.machine().replace("AMD64", "x86_64")
+SDK = Path("src/sdk") / SYSTEM / PLATFORM
 LIB = SDK / "lib"
 INCLUDE = SDK / "include"
 LINK = "shared" if SYSTEM == "Linux" else "static"
-
 # set env CYTHON_TRACE=1 to enable coverage on .pyx files
 CYTHON_TRACE = bool(os.getenv("CYTHON_TRACE", "0") not in ("0", "False"))
 

diff --git a/src/sdk/Darwin/include/Nd2ReadSdk.h → src/sdk/Darwin/x86_64/include/Nd2ReadSdk.h b/src/sdk/Darwin/include/Nd2ReadSdk.h → src/sdk/Darwin/x86_64/include/Nd2ReadSdk.h
diff --git a/src/sdk/Darwin/lib/libjbig.a → src/sdk/Darwin/x86_64/lib/libjbig.a b/src/sdk/Darwin/lib/libjbig.a → src/sdk/Darwin/x86_64/lib/libjbig.a
diff --git a/src/sdk/Darwin/lib/libjpeg.a → src/sdk/Darwin/x86_64/lib/libjpeg.a b/src/sdk/Darwin/lib/libjpeg.a → src/sdk/Darwin/x86_64/lib/libjpeg.a
diff --git a/src/sdk/Darwin/lib/liblimfile.a → src/sdk/Darwin/x86_64/lib/liblimfile.a b/src/sdk/Darwin/lib/liblimfile.a → src/sdk/Darwin/x86_64/lib/liblimfile.a
diff --git a/src/sdk/Darwin/lib/liblzma.a → src/sdk/Darwin/x86_64/lib/liblzma.a b/src/sdk/Darwin/lib/liblzma.a → src/sdk/Darwin/x86_64/lib/liblzma.a
diff --git a/src/sdk/Darwin/lib/libnd2readsdk-static.a → .../Darwin/x86_64/lib/libnd2readsdk-static.a b/src/sdk/Darwin/lib/libnd2readsdk-static.a → .../Darwin/x86_64/lib/libnd2readsdk-static.a
diff --git a/src/sdk/Darwin/lib/libtiff.a → src/sdk/Darwin/x86_64/lib/libtiff.a b/src/sdk/Darwin/lib/libtiff.a → src/sdk/Darwin/x86_64/lib/libtiff.a
diff --git a/src/sdk/Darwin/lib/libtiffxx.a → src/sdk/Darwin/x86_64/lib/libtiffxx.a b/src/sdk/Darwin/lib/libtiffxx.a → src/sdk/Darwin/x86_64/lib/libtiffxx.a
diff --git a/src/sdk/Darwin/lib/libz.a → src/sdk/Darwin/x86_64/lib/libz.a b/src/sdk/Darwin/lib/libz.a → src/sdk/Darwin/x86_64/lib/libz.a
diff --git a/src/sdk/Linux/include/Nd2ReadSdk.h → src/sdk/Linux/x86_64/include/Nd2ReadSdk.h b/src/sdk/Linux/include/Nd2ReadSdk.h → src/sdk/Linux/x86_64/include/Nd2ReadSdk.h
diff --git a/src/sdk/Linux/lib/liblimfile.so → src/sdk/Linux/x86_64/lib/liblimfile.so b/src/sdk/Linux/lib/liblimfile.so → src/sdk/Linux/x86_64/lib/liblimfile.so
diff --git a/src/sdk/Linux/lib/libnd2readsdk-shared.so → .../Linux/x86_64/lib/libnd2readsdk-shared.so b/src/sdk/Linux/lib/libnd2readsdk-shared.so → .../Linux/x86_64/lib/libnd2readsdk-shared.so
diff --git a/src/sdk/Windows/include/Nd2ReadSdk.h → src/sdk/Windows/x86_64/include/Nd2ReadSdk.h b/src/sdk/Windows/include/Nd2ReadSdk.h → src/sdk/Windows/x86_64/include/Nd2ReadSdk.h
diff --git a/src/sdk/Windows/lib/jbig.lib → src/sdk/Windows/x86_64/lib/jbig.lib b/src/sdk/Windows/lib/jbig.lib → src/sdk/Windows/x86_64/lib/jbig.lib
diff --git a/src/sdk/Windows/lib/libjpeg.lib → src/sdk/Windows/x86_64/lib/libjpeg.lib b/src/sdk/Windows/lib/libjpeg.lib → src/sdk/Windows/x86_64/lib/libjpeg.lib
diff --git a/src/sdk/Windows/lib/limfile.lib → src/sdk/Windows/x86_64/lib/limfile.lib b/src/sdk/Windows/lib/limfile.lib → src/sdk/Windows/x86_64/lib/limfile.lib
diff --git a/src/sdk/Windows/lib/lzma.lib → src/sdk/Windows/x86_64/lib/lzma.lib b/src/sdk/Windows/lib/lzma.lib → src/sdk/Windows/x86_64/lib/lzma.lib
diff --git a/src/sdk/Windows/lib/nd2readsdk-static.lib → .../Windows/x86_64/lib/nd2readsdk-static.lib b/src/sdk/Windows/lib/nd2readsdk-static.lib → .../Windows/x86_64/lib/nd2readsdk-static.lib
diff --git a/src/sdk/Windows/lib/tiff.lib → src/sdk/Windows/x86_64/lib/tiff.lib b/src/sdk/Windows/lib/tiff.lib → src/sdk/Windows/x86_64/lib/tiff.lib
diff --git a/src/sdk/Windows/lib/tiffxx.lib → src/sdk/Windows/x86_64/lib/tiffxx.lib b/src/sdk/Windows/lib/tiffxx.lib → src/sdk/Windows/x86_64/lib/tiffxx.lib
diff --git a/src/sdk/Windows/lib/zlib.lib → src/sdk/Windows/x86_64/lib/zlib.lib b/src/sdk/Windows/lib/zlib.lib → src/sdk/Windows/x86_64/lib/zlib.lib