Merge pull request #1880 from onionshare/fix-macos-silicon-build

Adds packages in zip_include_packages as well

RELEASE.md

@@ -238,8 +238,6 @@ Make the Apple Silicon app bundle:
 
 ```sh
 /Library/Frameworks/Python.framework/Versions/3.11/bin/poetry run python ./setup-freeze.py bdist_mac
-rm -rf build/OnionShare.app/Contents/Resources/lib
-mv build/exe.macosx-10.9-universal2-3.11/lib build/OnionShare.app/Contents/Resources/
 /Library/Frameworks/Python.framework/Versions/3.11/bin/poetry run python ./scripts/build-macos.py cleanup-build
 ```
 

desktop/scripts/build-macos.py

@@ -167,12 +167,15 @@ def cleanup_build():
         "QtWebEngineQuick",
         "QtWebEngineQuickDelegatesQml",
     ]:
+        try:
             shutil.rmtree(
                 f"{app_path}/Contents/MacOS/lib/PySide6/Qt/lib/{framework}.framework"
             )
             print(
                 f"Deleted: {app_path}/Contents/MacOS/lib/PySide6/Qt/lib/{framework}.framework"
             )
+        except FileNotFoundError:
+            pass
         try:
             os.remove(f"{app_path}/Contents/MacOS/lib/PySide6/{framework}.abi3.so")
             print(f"Deleted: {app_path}/Contents/MacOS/lib/PySide6/{framework}.abi3.so")

desktop/setup-freeze.py

@@ -57,18 +57,8 @@ elif platform.system() == "Linux":
         print("Install the patchelf package")
         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": [
         "cffi",
         "engineio",
@@ -79,6 +69,7 @@ setup(
         "onionshare",
         "onionshare_cli",
         "PySide6",
+        "shiboken6",
         "PySide6.QtCore",
         "PySide6.QtGui",
         "PySide6.QtWidgets",
@@ -128,7 +119,36 @@ setup(
     ],
     "include_files": include_files,
     "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": {
             "iconfile": os.path.join("onionshare", "resources", "onionshare.icns"),