-
Notifications
You must be signed in to change notification settings - Fork 118
Add build phase script to remove Wormholy files #15804
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash -eu | ||
|
||
# if [ "${CONFIGURATION}" != "Release" ]; then | ||
# echo "info: Skipping Wormholy removal – not a Release build." | ||
# exit 0 | ||
# fi | ||
|
||
# FIXME: Delete from all builds to test the implementation | ||
|
||
BUILT_PRODUCTS_DIR=${BUILT_PRODUCTS_DIR:-"$TARGET_BUILD_DIR"} | ||
|
||
# Crude way to remove all the Wormholy files from the build. | ||
rm -rf "$BUILT_PRODUCTS_DIR/Wormholy*" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What do you think about using
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure that Besides, using Overall I'm not sure there's any perfect solution, unless we find a way to determine the actual list of files generated by the Wormholy package in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Btw, are we sure that removing the Which would actually be the worst case scenario, as that would make Debug builds compile and work, and Release builds compile too (making us think they also work) but failed to launch… and it'd be easy to thus submit a Release build to App Store that would in practice fail to launch and not realize it until it's too late… I don't have any magical solution for that though tbh. The only option I could think of that might feel safe enough to me would be remove Wormholy from the project before building a Release Build. That is, to write a script that would remove There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, using the command as-is would delete only files (and empty directories), but indeed also files deeper in the directory structure. My main idea was to go deeper in the structure and have more control over the search (we could do alternatively something like
This actually doesn't sound too bad given the current constraints 🤔 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
🤔 🤔 🤔 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Implemented in #15813. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,9 +19,9 @@ import class Yosemite.ScreenshotStoresManager | |
// In that way, Inject will be available in the entire target. | ||
@_exported import Inject | ||
|
||
#if DEBUG | ||
import WormholySwift | ||
#endif | ||
//#if DEBUG | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was gonna say something about trying
|
||
//import WormholySwift | ||
//#endif | ||
|
||
// MARK: - Woo's App Delegate! | ||
// | ||
|
@@ -415,10 +415,10 @@ private extension AppDelegate { | |
/// Set up Wormholy only in Debug build configuration | ||
/// | ||
func setupWormholy() { | ||
#if DEBUG | ||
// We want to activate it programmatically, not using the shake. | ||
Wormholy.shakeEnabled = false | ||
#endif | ||
//#if DEBUG | ||
// // We want to activate it programmatically, not using the shake. | ||
// Wormholy.shakeEnabled = false | ||
//#endif | ||
} | ||
|
||
/// Set up `KeyboardStateProvider` | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Obviously we should remove the comments before merging.