Tyler's xcodebuild backend + fixed Xcode integration, fixed signing & --device
#61
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add new conditional arg to determine if building with swift/xcodebuild. Signed-off-by: furby™ <[email protected]> * Get things minimally working. * TODO refactor/cleanup, explore SDK generator alternative to remove xcodebuild - xcode dependency. Signed-off-by: furby™ <[email protected]> * Add xcbeautify. Signed-off-by: furby™ <[email protected]> * Use xcbeautify from brew. Signed-off-by: furby™ <[email protected]> * Fixup xcbeautify for cross-platform pretty build output. Signed-off-by: furby™ <[email protected]> * Fix problematic bundle path and Xcode generation. Signed-off-by: furby™ <[email protected]> * Use provided CLI output directory or default for xcodebuild. Signed-off-by: furby™ <[email protected]> * Bundling of xcodebuild products, a success. Signed-off-by: furby™ <[email protected]> * Automatically propagate all xcodebuild destinations. * the simctl simulators listing actually has enough metadata to generate all the available xcodebuild destinations, and it was in json format. :) Signed-off-by: furby™ <[email protected]> * Migrate xcodebuild logic to XcodeBuildManager. Signed-off-by: furby™ <[email protected]> * Migrate OSSimulators to own file. Signed-off-by: furby™ <[email protected]> * Remove unused bundler extension. Signed-off-by: furby™ <[email protected]> * Workaround a strange compiler bug on Linux. Signed-off-by: furby™ <[email protected]> * Fix GraphViz dependency. Signed-off-by: furby™ <[email protected]> * Add --xcodebuild flag, also support xcodebuild for macOS if true. Signed-off-by: furby™ <[email protected]> * Fix doc comment for new --xcodebuild flag. Signed-off-by: furby™ <[email protected]> * Specify a -destination to xcodebuild for macOS. Signed-off-by: furby™ <[email protected]> * Fix a case where copying exe from xcodebuild may fail. * In some cases, for reasons unknown, xcodebuild may generate an app bundle in it's built products path, and will place the executable inside this app bundle, this fix issues a workaround to use that path to copy the executable instead, only if it exists. Signed-off-by: furby™ <[email protected]> * Fix incorrectly adjusting rpath for pre-bundled executables. Signed-off-by: furby™ <[email protected]> * Support tvOS with xcodebuild, add simulator utilities. Signed-off-by: furby™ <[email protected]> * Sort xcodebuild destinations, to default to latest installed OS version. Signed-off-by: furby™ <[email protected]> * Add support for bundling projects with an xcodeproj. Signed-off-by: furby™ <[email protected]> * Fix stripping of first 3 chars of dynamic library names. Signed-off-by: furby™ <[email protected]> * Drop xcodeproj support, terminate if xcodebuild tries to build a xcodeproj. Signed-off-by: furby™ <[email protected]> * Add '--no-xcodebuild' flag to force swiftpm on embedded darwin platforms. Signed-off-by: furby™ <[email protected]> * Remove unused outputDirectory arg and misc. warnings. Signed-off-by: furby™ <[email protected]> * Fixup merge conflicts. Signed-off-by: furby™ <[email protected]> * Fix merge conflicts & strange formatting issue. Signed-off-by: furby™ <[email protected]> * Fix some other strange formatting issues. Signed-off-by: furby™ <[email protected]> * Use iterators on OS simulator listing. Signed-off-by: furby™ <[email protected]> * Fix resource bundles failing to copy with xcodebuilt products. Signed-off-by: furby™ <[email protected]> * Add reusable logic for checking whether in xcodebuild context. * Restores the async bundle command to be immutable again, instead of mutable. Signed-off-by: furby™ <[email protected]> * Make '--no-xcodebuild' logic easier to understand. Signed-off-by: furby™ <[email protected]> * furby™ signed off Signed-off-by: Tyler Furby <[email protected]> Signed-off-by: furby™ <[email protected]> * Fix superfluous `starting [config] build` msg. Signed-off-by: furby™ <[email protected]> * only codesign with adhoc signature on embedded. Signed-off-by: furby™ <[email protected]> * Add additional --Xswiftpm args to xcodebuild. Signed-off-by: furby™ <[email protected]> --------- Signed-off-by: furby™ <[email protected]> Signed-off-by: Tyler Furby <[email protected]>
Will need a new metadata approach to re-enable metadata insertion when codesigning.
Without these changes I was getting 'The application could not be verified'. We only generate the entitlements if the user doesn't provide their own.
Removed a bunch of Xcode simulator parsing logic that isn't necessary now that we just build for a generic OS target.
The automatic entitlements generation was running whenever signing an app bundle, however it should only have been happening when signing app bundles for platforms requiring provisioning profiles.
The Xcode support files (xcschemes) interfere with the build/bundling process because they call Swift Bundler themselves so you end up with Swift Bundler gettings invoked by Swift Bundler but with different arguments provided by the xcodebuild post-build action, and it all starts getting pretty messy.
xcbeautify integration can be disabled using SWIFT_BUNDLER_USE_XCBEAUTIFY=0.
Swift Bundler is a lot smarter with its existing --platform and --simulator options, and its new --device option. It can now infer the platform from the device/simulator selected, and vice versa. Even just the --device option alone will be a big QoL improvement. Rewrote device handling and app running in the process and it's all a lot nicer now. Less repeated code. That being said, my Xcode destination parsing code may cancel out all the gains of that refactoring...
Building universal binaries directly seems to be broken for all Xcode versions available in the latest macOS runners, so for now we can just build the x86_64 and arm64 binaries separately then combine using lipo.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR
xcodebuildbackend which fixes cross-compilation from macOS to non-macOS Apple platforms (such as iOS). It fixes platform conditional dependencies and macros among other features.swift bundler generate-xcode-supportgot broken by some changes I made a little while ago)--devicecommand-line option for specifying which physical iOS device to target when running/bundling--platform,--simulatorand--device. Swift Bundler can now infer the platform from the selected device/simulator.