Repository navigation
Fix Mac Release build: stop calling DEBUG-only helpers from fork code - #98
Merged
Merged
Conversation
…ase code debugDesiredFocusState() and cmuxDebugLog exist only in DEBUG, so the Mac Release build failed to compile. Expose a read-only isFocusDesired inside the device-terminal-focus fence (#817) and guard the route-candidate log.
Contributor
|
Merge receipt for
Labeled |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
The Mac Release build (
scripts/supermux-release.sh) failed to compile, so no Release app could be installed frommain. Two pieces of fork code called helpers that exist only under#if DEBUG:SupermuxDeviceTerminalActionsreadTerminalSurface.debugDesiredFocusState(). It now reads a new public, read-onlyisFocusDesired. The accessor sits inside the existingdevice-terminal-focusfence inTerminalSurface.swift(touchpoint #817) and returns the same storeddesiredFocusState.SupermuxRouteCandidateSynccalledcmuxDebugLog. That call is now wrapped in#if DEBUG.Debug builds behave exactly as before.
Testing
xcodebuildinvocation (Release,SUPERMUX_LOCAL_RELEASE, unsigned) on this branch merged with currentmain:** BUILD SUCCEEDED **. Onmainthe same build fails with the five errors listed above.scripts/supermux-check-touchpoints.shpasses.python3 scripts/verify-local.pyfails onlylocalization(missingsupermux.activity.needsInputlocales) andconfig-schema(stale generated schema). Both failures come frommain; this PR touches neither.Changelog
none