Adds condition to add zip_packages only in Apple Silicion

This commit is contained in:
Saptak S 2024-02-27 02:17:56 +05:30
parent 44fcb6cfdb
commit d6d8298bef
No known key found for this signature in database
GPG key ID: 7B7F1772C0C6FCBF

View file

@ -57,18 +57,8 @@ elif platform.system() == "Linux":
print("Install the patchelf package") print("Install the patchelf package")
sys.exit() sys.exit()
setup(
name="onionshare", build_exe_options = {
version=version,
description="Securely and anonymously share files, host websites, and chat with friends using the Tor network",
packages=find_packages(
where=".",
include=["onionshare"],
exclude=["package", "screenshots", "scripts", "tests"],
),
options={
# build_exe, for Windows and macOS
"build_exe": {
"packages": [ "packages": [
"cffi", "cffi",
"engineio", "engineio",
@ -79,18 +69,7 @@ setup(
"onionshare", "onionshare",
"onionshare_cli", "onionshare_cli",
"PySide6", "PySide6",
"PySide6.QtCore", "shiboken6",
"PySide6.QtGui",
"PySide6.QtWidgets",
],
"zip_include_packages": [
"cffi",
"engineio",
"engineio.async_drivers.gevent",
"engineio.async_drivers.gevent_uwsgi",
"gevent",
"jinja2.ext",
"PySide6",
"PySide6.QtCore", "PySide6.QtCore",
"PySide6.QtGui", "PySide6.QtGui",
"PySide6.QtWidgets", "PySide6.QtWidgets",
@ -140,7 +119,36 @@ setup(
], ],
"include_files": include_files, "include_files": include_files,
"include_msvcr": include_msvcr, "include_msvcr": include_msvcr,
}, }
# If Mac Silicon, the dependencies need to be in zip_include_packages
if platform.system() == "Darwin" and platform.processor() == "arm":
build_exe_options["zip_include_packages"] = [
"cffi",
"engineio",
"engineio.async_drivers.gevent",
"engineio.async_drivers.gevent_uwsgi",
"gevent",
"jinja2.ext",
"PySide6",
"shiboken6",
"PySide6.QtCore",
"PySide6.QtGui",
"PySide6.QtWidgets",
]
setup(
name="onionshare",
version=version,
description="Securely and anonymously share files, host websites, and chat with friends using the Tor network",
packages=find_packages(
where=".",
include=["onionshare"],
exclude=["package", "screenshots", "scripts", "tests"],
),
options={
# build_exe, for Windows and macOS
"build_exe": build_exe_options,
# bdist_mac, making the macOS app bundle # bdist_mac, making the macOS app bundle
"bdist_mac": { "bdist_mac": {
"iconfile": os.path.join("onionshare", "resources", "onionshare.icns"), "iconfile": os.path.join("onionshare", "resources", "onionshare.icns"),