Adapt build dependencies for macOS

Nitrokey · Sep 24, 2024 · c38f9d8 · c38f9d8
1 parent 13d6b69
commit c38f9d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 28 deletions.
diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
 
 datas = [
     (venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
-    (venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
 datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
-datas += copy_metadata('pynitrokey')
-datas += copy_metadata('pyusb')
-datas += copy_metadata('spsdk')
+datas += copy_metadata('nitrokey')
 
 a = Analysis(
     ['../../../nitrokeyapp/__main__.py'],
     pathex=[],
-    binaries=[
-        (venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_arm64/libusbsio.dylib', 'libusbsio')
-    ],
+    binaries=[],
     datas=datas,
     hiddenimports=[],
     hookspath=[],

diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_intel64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_intel64.spec
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
 
 datas = [
     (venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
-    (venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
 datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
-datas += copy_metadata('pynitrokey')
-datas += copy_metadata('pyusb')
-datas += copy_metadata('spsdk')
+datas += copy_metadata('nitrokey')
 
 a = Analysis(
     ['../../../nitrokeyapp/__main__.py'],
     pathex=[],
-    binaries=[
-        (venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_x86_64/libusbsio.dylib', 'libusbsio')
-    ],
+    binaries=[],
     datas=datas,
     hiddenimports=[],
     hookspath=[],

diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_arm64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_arm64.spec
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
 
 datas = [
     (venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
-    (venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
 datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
-datas += copy_metadata('pynitrokey')
-datas += copy_metadata('pyusb')
-datas += copy_metadata('spsdk')
+datas += copy_metadata('nitrokey')
 
 a = Analysis(
     ['../../../nitrokeyapp/__main__.py'],
     pathex=[],
-    binaries=[
-        (venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_arm64/libusbsio.dylib', 'libusbsio')
-    ],
+    binaries=[],
     datas=datas,
     hiddenimports=[],
     hookspath=[],

diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_intel64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onefile_intel64.spec
@@ -8,23 +8,18 @@ python_version = str(sys.version_info[0]) + '.' + str(sys.version_info[1])
 
 datas = [
     (venv_path + '/lib/python' + python_version + '/site-packages/fido2/public_suffix_list.dat', 'fido2'),
-    (venv_path + '/lib/python' + python_version + '/site-packages/pynitrokey/VERSION', 'pynitrokey'),
     ('../../../nitrokeyapp/ui', 'nitrokeyapp/ui'),
     ('../../../LICENSE', '.')
 ]
 datas += copy_metadata('ecdsa')
 datas += copy_metadata('fido2')
 datas += copy_metadata('nitrokeyapp')
-datas += copy_metadata('pynitrokey')
-datas += copy_metadata('pyusb')
-datas += copy_metadata('spsdk')
+datas += copy_metadata('nitrokey')
 
 a = Analysis(
     ['../../../nitrokeyapp/__main__.py'],
     pathex=[],
-    binaries=[
-        (venv_path + '/lib/python' + python_version + '/site-packages/libusbsio/bin/osx_x86_64/libusbsio.dylib', 'libusbsio')
-    ],
+    binaries=[],
     datas=datas,
     hiddenimports=[],
     hookspath=[],