RNS-Things/reticulum-meshchatX
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Add support for universal Mac build (x64 + arm64) #19

Closed
Sudo-Ivan wants to merge 1 commits from universal-mac-build into master
pull from: universal-mac-build
merge into: RNS-Things:master
Conversation 0 Commits 1 Files Changed 4 +22385 -11485
Sudo-Ivan commented 2025-11-25 18:10:29 +00:00 (Migrated from github.com)
Copy Link

Created PR from ShaTie's fork

Changes to package.json:

  • Enable ASAR packaging (was disabled)
  • Replace extraFiles with extraResources for Python executables
    • Old: Resources/app/electron/build/exe
    • New: Resources/python (outside ASAR, accessible to spawn)
  • Mac: Add universal build support (x64 + arm64 in single .dmg)
  • Mac: Add x64ArchFiles rule for Python (cx_Freeze creates universal binaries)
  • Mac: Add explicit icon configuration
  • Mac: Update artifact name to include architecture
  • Remove buildResources directive (conflicted with extraResources)
  • Remove duplicate extraFiles from win/linux sections (centralized)
  • Add npm scripts: dist:mac-arm64 and dist:mac-universal

Changes to electron/main.js:

  • Update Python exe path resolution for extraResources location
  • Check process.resourcesPath/python first (production build)
  • Fall back to local build/exe for development

Changes to .github/workflows/build.yml:

  • Switch Mac runner from macos-13 (Intel) to macos-14 (Apple Silicon)
  • Update artifacts pattern from '-mac.dmg' to '-mac-*.dmg'
Created PR from ShaTie's fork Changes to package.json: - Enable ASAR packaging (was disabled) - Replace extraFiles with extraResources for Python executables - Old: Resources/app/electron/build/exe - New: Resources/python (outside ASAR, accessible to spawn) - Mac: Add universal build support (x64 + arm64 in single .dmg) - Mac: Add x64ArchFiles rule for Python (cx_Freeze creates universal binaries) - Mac: Add explicit icon configuration - Mac: Update artifact name to include architecture - Remove buildResources directive (conflicted with extraResources) - Remove duplicate extraFiles from win/linux sections (centralized) - Add npm scripts: dist:mac-arm64 and dist:mac-universal Changes to electron/main.js: - Update Python exe path resolution for extraResources location - Check process.resourcesPath/python first (production build) - Fall back to local build/exe for development Changes to .github/workflows/build.yml: - Switch Mac runner from macos-13 (Intel) to macos-14 (Apple Silicon) - Update artifacts pattern from '*-mac.dmg' to '*-mac-*.dmg'

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Ivan
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: RNS-Things/reticulum-meshchatX#19
Delete Branch "universal-mac-build"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?