From c38f9d81023e2ea6012cc8c47b49e5b6ad2740da Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Tue, 24 Sep 2024 15:20:04 +0200 Subject: [PATCH] Adapt build dependencies for macOS --- .../macos/pyinstaller/nitrokey-app-onedir_arm64.spec | 9 ++------- .../macos/pyinstaller/nitrokey-app-onedir_intel64.spec | 9 ++------- .../macos/pyinstaller/nitrokey-app-onefile_arm64.spec | 9 ++------- .../macos/pyinstaller/nitrokey-app-onefile_intel64.spec | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec b/ci-scripts/macos/pyinstaller/nitrokey-app-onedir_arm64.spec index a6a4af7f..2f502cc5 100644 --- 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 index ebe6ffe0..96dde38a 100644 --- 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 index 1439974e..c2a99844 100644 --- 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 index ffe444fb..c3dd2a03 100644 --- 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=[],