Merge branch 'master' of github.com:intrepidcs/python_ics

Author: drebbe-intrepid

.github/workflows/wheels.yml

@@ -0,0 +1,28 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, windows-2019, macOS-11]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v3
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.12.1
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: ./wheelhouse/*.whl
+          if-no-files-found: error

build_libicsneo.py

@@ -16,10 +16,10 @@ def checkout():
     subprocess.check_output(
         ['git', 'checkout', LIBICSNEO_COMMIT], cwd='libicsneo')
 
-    if not os.path.isdir('libusb'):
+    if not os.path.isdir('libusb') and sys.platform == 'darwin':
         subprocess.check_output(
             ['git', 'clone', 'https://github.com/libusb/libusb.git'])
-    subprocess.check_output(['git', 'checkout', LIBUSB_COMMIT], cwd='libusb')
+        subprocess.check_output(['git', 'checkout', LIBUSB_COMMIT], cwd='libusb')
 
 
 def _build_libusb():
@@ -37,11 +37,19 @@ def _build_libusb():
     subprocess.check_output(['make', 'install'], cwd='libusb')
 
 
-def _build_icsneo():
+def _build_icsneo_linux():
     subprocess.check_output(['git', 'clean', '-xdf'], cwd='libicsneo')
     subprocess.check_output(['mkdir', '-p', 'libicsneo/build'])
 
-    subprocess.check_output(['cmake', '..', '-DCMAKE_BUILD_TYPE=RelWithDebInfo', '-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64',
+    subprocess.check_output(['cmake', '..', '-DCMAKE_BUILD_TYPE=Release', '-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON'], cwd='libicsneo/build')
+    subprocess.check_output(['cmake', '--build', '.', '--target',
+                            'icsneolegacy', '--parallel', CPUS], cwd='libicsneo/build')
+
+def _build_icsneo_macos():
+    subprocess.check_output(['git', 'clean', '-xdf'], cwd='libicsneo')
+    subprocess.check_output(['mkdir', '-p', 'libicsneo/build'])
+
+    subprocess.check_output(['cmake', '..', '-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64',
                             '-DLIBICSNEO_BUILD_ICSNEOLEGACY=ON', '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13',
                             '-DLIBUSB_LIBRARIES=/tmp/libusb/lib/libusb-1.0.0.dylib',
                             '-DLIBUSB_INCLUDE_DIR=/tmp/libusb/include/libusb-1.0'], cwd='libicsneo/build')
@@ -53,15 +61,23 @@ def _build_icsneo():
 
 
 def build():
-    _build_libusb()
-    _build_icsneo()
+    print("Building libicsneo...")
+    if sys.platform == 'darwin':
+        _build_libusb()
+        _build_icsneo_macos()
+    elif sys.platform == 'linux':
+        _build_icsneo_linux()
 
 
 def copy():
-    shutil.copyfile('/tmp/libusb/lib/libusb-1.0.0.dylib',
-                    'ics/libusb-1.0.0.dylib')
-    shutil.copyfile('libicsneo/build/libicsneolegacy.dylib',
-                    'ics/libicsneolegacy.dylib')
+    if sys.platform == 'darwin':
+        shutil.copyfile('/tmp/libusb/lib/libusb-1.0.0.dylib',
+                        'ics/libusb-1.0.0.dylib')
+        shutil.copyfile('libicsneo/build/libicsneolegacy.dylib',
+                        'ics/libicsneolegacy.dylib')
+    elif sys.platform == 'linux':
+        shutil.copyfile('libicsneo/build/libicsneolegacy.so',
+                        'ics/libicsneolegacy.so')
 
 
 def clean():

generate_icsneo40_structs.py

@@ -844,34 +844,38 @@ def generate_all_files():
     import os
     import pathlib
 
-    try:
-        if sys.argv[0] == 'setup.py':
-            raise IndexError
-        # Grab the filename from the command line
-        filename = sys.argv[1]
-        filename = os.path.normpath(filename)
-        print(f"Parsing '{filename}'...")
-    except IndexError as _:
-        # use our default path if it isn't supplied
-        filename = 'include/ics/icsnVC40.h'
-    if not pathlib.Path(filename).exists():
-        raise FileNotFoundError(filename)
+    filename = 'include/ics/icsnVC40.h'
+    if __name__ == '__main__':
+        try:
+            if sys.argv[0] == 'setup.py':
+                raise IndexError
+            # Grab the filename from the command line
+            filename = sys.argv[1]
+            filename = os.path.normpath(filename)
+            print(f"Parsing '{filename}'...")
+        except IndexError as _:
+            # use our default path if it isn't supplied
+            filename = 'include/ics/icsnVC40.h'
+        if not pathlib.Path(filename).exists():
+            raise FileNotFoundError(filename)
     generate(filename)
 
     # Internal Header
-    try:
-        if sys.argv[0] == 'setup.py':
-            raise IndexError
-        # Grab the filename from the command line
-        filename_internal = sys.argv[2]
-        filename_internal = os.path.normpath(filename_internal)
-        print(f"Parsing '{filename_internal}'...")
-    except IndexError as _:
-        # use our default path if it isn't supplied
+    if __name__ == '__main__':
         filename_internal = 'include/ics/icsnVC40Internal.h'
-    if pathlib.Path(filename_internal).exists():
-        print("WARNING: Generating internal header!")
-        generate(filename_internal)
+        try:
+            if sys.argv[0] == 'setup.py':
+                raise IndexError
+            # Grab the filename from the command line
+            filename_internal = sys.argv[2]
+            filename_internal = os.path.normpath(filename_internal)
+            print(f"Parsing '{filename_internal}'...")
+        except IndexError as _:
+            # use our default path if it isn't supplied
+            filename_internal = 'include/ics/icsnVC40Internal.h'
+        if pathlib.Path(filename_internal).exists():
+            print("WARNING: Generating internal header!")
+            generate(filename_internal)
 
 
 if __name__ == '__main__':

pyproject.toml

@@ -0,0 +1,16 @@
+[tool.cibuildwheel]
+build = "{*-win32,*-win_amd64,*-macosx_universal2,*-manylinux_x86_64,*-manylinux_aarch64}"
+skip = "cp36-* pp* *-manylinux_i686 *-musllinux_*"
+environment = {DISTUTILS_DEBUG=1}
+before-build = "python -m pip install wheel"
+manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64"
+
+[tool.cibuildwheel.linux]
+before-build = "dnf install -y libpcap-devel cmake libusbx-devel clang clang-tools-extra"
+
+[tool.cibuildwheel.macos]
+archs = ["universal2"]
+before-build = "brew install automake libtool cmake clang-format"
+
+[tool.cibuildwheel.windows]
+before-build = "choco install llvm"

setup.py

@@ -59,7 +59,7 @@ def run(self):
         import generate_icsneo40_structs
         extract_icsneo40_defines.extract()
         generate_icsneo40_structs.generate_all_files()
-        if 'DARWIN' in platform.system().upper():
+        if platform.system().upper() in ('DARWIN', 'LINUX'):
             import build_libicsneo
             build_libicsneo.checkout()
             build_libicsneo.build()
@@ -111,6 +111,8 @@ def read(fname):
 package_data = {}
 if 'DARWIN' in platform.system().upper():
     package_data['ics'] = ['*.dylib']
+elif 'LINUX' in platform.system().upper():
+    package_data[''] = ['*.so']
 
 setup(name='python_ics',
       version=VERSION_STRING,

src/dll.cpp

@@ -19,7 +19,7 @@ bool __initialize(char* name)
 #elif (defined(__APPLE__))
             LIBRARY = new ice::Library("@loader_path/libicsneolegacy.dylib");
 #else
-            LIBRARY = new ice::Library("libicsneolegacy.so");
+            LIBRARY = new ice::Library("${ORIGIN}/libicsneolegacy.so");
 #endif
         }
         else