Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Mac Crafter #6830

Merged
merged 54 commits into from
Jul 8, 2024
Merged

Add Mac Crafter #6830

merged 54 commits into from
Jul 8, 2024

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Jun 24, 2024 •
edited
Loading

This is a script that automates the process of building and codesigning the desktop client under macOS

With Mac Crafter, we can reliably produce Qt 6 builds that are fully codesigned. These builds are ready for distribution. Also super useful for testing changes to the client

Can be run by cding to the mac crafter folder and running swift run mac-crafter. Can be provided with a codesigning identity with -c

Closes #6744

Depends on nextcloud/desktop-client-blueprints#16

@claucambra claucambra requested review from mgallien and camilasan June 24, 2024 09:32
@claucambra claucambra self-assigned this Jun 24, 2024
claucambra added 27 commits July 8, 2024 15:21
@claucambra
Start working on mac builder script
06fb86b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add convenience func to run shell command
21853da 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add convenience func to check if command exists
cf83f81 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Install brew through builder if not present
f213959 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Install inkscape via mac builder script if not present
b6c09e2 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Configure xcode command line tools if missing in mac builder
6df8146 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Set up python if missing in mac builder script
19c14d0 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Deduplicate installation of required tools in macos builder
fd0d39f 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clone craft in mac builder script
92ed12b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Clone craft master to craftdir in mac builder script
70331dd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Craft the desktop client in the mac builder script
dd943fd 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add codesign function to macos builder
1580382 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Move build script into dedicated package
ee7630e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add copyright header to main.swift
1290ab4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Move functions of mac crafter into different files
67bcf91 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Implement basic argumentparser in mac crafter
916f1fb 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make installIfMissing throwing in mac crafter
9a0095c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make codesigning throw in mac crafter
f60dd6e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Codesign all the crafted libraries with mac crafter
3362912 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Codesign all crafted plugins in mac crafter
86e50ae 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Move library check to separate file in mac crafter
5a3c1d3 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make build path adjustable in mac crafter
79a933f 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make URLs adjustable in mac crafter
2484b28 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix dependencies for mac-crafter
7a9cbb9 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Adjust arguments for mac crafter
17c7105 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix mac-crafter abstract
190922e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix paths in mac crafter
fdc505a 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
claucambra added 23 commits July 8, 2024 15:21
@claucambra
Fix buildtype argument for craft in mac crafter
e3866e4 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Throw if codesign binary not found in mac crafter
15f6d35 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Fix unused codesignidentity warning in mac crafter
e6c7665 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Divide client app dir path construction in mac crafter
ccb6210 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add option to skip craft configuration in mac crafter
6e43443 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add relevant files to mac crafter gitignore
b0328a7 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Directly sign plugins and frameworks within app bundle in mac crafter
7578546 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Extract app bundle codesigning procedure to separate file in mac crafter
d5d5365 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Remove unused Build file in mac crafter
589f229 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add support for fetching and including Sparkle in mac crafter
b554882 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make craft blueprint name adjustable in mac crafter
9f84da1 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Use --options as recommended for configuring craft build in mac crafter
0b57046 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Always configure craft if first download and set to not reconfigure b…
0513bf5 
…y default in mac crafter

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Allow setting custom git clone command in mac crafter
c342db2 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Compile and install instead of full clean rebuild of client in mac cr…
77062ee 
…after

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Throw on failure of any shell commands to complete successfully in ma…
00873b7 
… crafter

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Make mac-related build options configurable in mac crafter
17d98d8 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Improve build mode flag handling in mac crafter
87fd676 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Simplify dylib signing process and ensure resource libs are signed in…
4ceb7ad 
… mac crafter

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
When doing a full rebuild in mac crafter, delete old build folder
c41c03e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add option to build tests or not in mac crafter
246da6c 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Replace bool options with flags in mac crafter
ecc0010 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra
Add offline flag to mac crafter
f64b80f 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra claucambra force-pushed the feature/mac-builder branch from 3d99518 to f64b80f Compare July 8, 2024 07:21
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6830-f64b80f9ced3df2f26da7e5bebdb9da93f2ef4c3-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra merged commit db0c577 into master Jul 8, 2024
12 of 13 checks passed
@claucambra claucambra deleted the feature/mac-builder branch July 8, 2024 07:41
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jul 8, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@joshtrichards joshtrichards mentioned this pull request Aug 16, 2024
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: macOS App Bundle broken on master (Qt 6)
3 participants
@claucambra @nextcloud-desktop-bot @mgallien