aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaptak S <saptak013@gmail.com>2024-02-28 02:08:53 +0530
committerSaptak S <saptak013@gmail.com>2024-02-28 02:08:53 +0530
commit2d22910c999f3960adf5e9fa136744e78e31b8ea (patch)
tree5064e318a60f11ee551c44fbf760f9a95402ac70
parentd6d8298bef350e0cf1497f9be4f1cfab36019630 (diff)
downloadonionshare-fix-macos-silicon-build.tar.gz
onionshare-fix-macos-silicon-build.zip
Updates cleanup script and release documentation for apple siliconfix-macos-silicon-build
-rw-r--r--RELEASE.md2
-rw-r--r--desktop/scripts/build-macos.py15
2 files changed, 9 insertions, 8 deletions
diff --git a/RELEASE.md b/RELEASE.md
index f2ddfaa3..39ac214d 100644
--- a/RELEASE.md
+++ b/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
```
diff --git a/desktop/scripts/build-macos.py b/desktop/scripts/build-macos.py
index c998eb0d..4200b6af 100644
--- a/desktop/scripts/build-macos.py
+++ b/desktop/scripts/build-macos.py
@@ -167,12 +167,15 @@ def cleanup_build():
"QtWebEngineQuick",
"QtWebEngineQuickDelegatesQml",
]:
- 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"
- )
+ 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")