]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Match the universal build instructions with what we actually do with mac-crafter...
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Tue, 8 Oct 2024 02:41:33 +0000 (10:41 +0800)
committerCamila Ayres <hello@camilasan.com>
Tue, 8 Oct 2024 12:32:37 +0000 (14:32 +0200)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
admin/osx/mac-crafter/README.md

index ee53475f626beed8c64baf3f5e5f27ecfda11b9b..4c4ba7d8afd0f7a5c06dd88bd86ff503b223b53b 100644 (file)
@@ -55,23 +55,8 @@ The options are `x86_64` and `arm64`.
 
 ### How to build the app bundle for arm and intel
 
-To achieve this we are using [KDE Craft](https://community.kde.org/Craft).
-
-1. After running the steps above, you will be able to use the `CraftMaster.py` script for that:
-
-```
-python build/craftmaster/CraftMaster.py --config <cloned desktop repo>/craftmaster.ini --target macos-clang-arm64 -c --add-blueprint-repository https://github.com/nextcloud/desktop-client-blueprints/
-```
-
-The `--target` options are define in the [`craftmaster.ini` file](https://github.com/nextcloud/desktop/blob/c771c4166c806d686d9b4f8b11e33d8d95631398/craftmaster.ini).
-
-2. Install the client dependencies
-```
-python build/craftmaster/CraftMaster.py --config <cloned desktop repo>/craftmaster.ini --target macos-clang-arm64 -c --install-deps nextcloud-client
-```
-
-3. Build the client
+To achieve this we are using a Python script called `make_universal.py` which bundles together the arm64 and Intel builds into one universal app bundle. This script can be found under `admin/osx`. You can invoke it like so:
 
 ```
-python build/craftmaster/CraftMaster.py --config <cloned desktop repo>/craftmaster.ini --target macos-clang-arm64 -c --src-dir <cloned desktop repo> nextcloud-client
+python admin/osx/make_universal.py <x86 build path> <arm64 build path> <final target path>
 ```