Adding macOS support

.github/workflows/build-macos-arm.yml

@@ -0,0 +1,139 @@
+name: Build macOS App (Apple Silicon)
+
+on:
+  push:
+    branches:
+      - "**"
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - "**"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build macOS Bundle (Apple Silicon)
+    runs-on: macos-14
+    outputs:
+      version: ${{ steps.set-version.outputs.version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set Version
+        id: set-version
+        shell: bash
+        run: |
+          if [[ "${{ github.ref_type }}" == "tag" ]]; then
+            VERSION=${{ github.ref_name }}
+          elif git describe --tags >/dev/null 2>&1; then
+            VERSION=$(git describe --tags)
+          else
+            VERSION="v0.0.0-$(git rev-parse --short HEAD)"
+          fi
+          if [ -z "$VERSION" ]; then
+            echo "Error: No git version number found!"
+            exit 1
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Version: $VERSION"
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: requirements.txt
+
+      - name: Install Pixi
+        uses: prefix-dev/setup-pixi@v0.8.1
+        with:
+          pixi-version: v0.48.2
+          cache: true
+          cache-key: ${{ github.sha }}-macos-arm
+
+      - name: Install macOS dependencies
+        run: bash scripts/mac_setup.sh --install
+
+      - name: Lint
+        run: pixi run lint
+
+      - name: Test
+        run: pixi run test
+
+      - name: Build macOS artifacts
+        run: |
+          printf "4\n" | bash scripts/mac_build.sh --version "${{ env.VERSION }}"
+
+      - name: Package .app bundle
+        run: |
+          APP_PATH="dist/Rayforge.app"
+          if [ ! -d "$APP_PATH" ]; then
+            echo "App bundle not found at $APP_PATH"
+            exit 1
+          fi
+          ZIP_NAME="rayforge-${{ steps.set-version.outputs.version }}-macos-arm-app.zip"
+          ditto -c -k --keepParent "$APP_PATH" "$ZIP_NAME"
+
+      - name: Rename DMG
+        run: |
+          DMG_PATH="dist/Rayforge_${{ env.VERSION }}.dmg"
+          if [ ! -f "$DMG_PATH" ]; then
+            echo "DMG not found at $DMG_PATH"
+            exit 1
+          fi
+          OUT_DMG="rayforge-${{ steps.set-version.outputs.version }}-macos-arm.dmg"
+          mv "$DMG_PATH" "$OUT_DMG"
+
+      - name: Upload macOS bundle artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rayforge-${{ steps.set-version.outputs.version }}-macos-arm-app.zip
+          path: rayforge-${{ steps.set-version.outputs.version }}-macos-arm-app.zip
+          compression-level: 9
+
+      - name: Upload DMG artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rayforge-${{ steps.set-version.outputs.version }}-macos-arm-dmg
+          path: rayforge-${{ steps.set-version.outputs.version }}-macos-arm.dmg
+
+  release:
+    name: Create GitHub Release (Apple Silicon)
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') && github.repository == 'barebaric/rayforge'
+    permissions:
+      contents: write
+    steps:
+      - name: Download macOS app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: rayforge-${{ needs.build.outputs.version }}-macos-arm-app.zip
+
+      - name: Download DMG artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: rayforge-${{ needs.build.outputs.version }}-macos-arm-dmg
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            rayforge-${{ needs.build.outputs.version }}-macos-arm-app.zip
+            rayforge-${{ needs.build.outputs.version }}-macos-arm.dmg
+          draft: false
+          prerelease: false
+          name: Release ${{ needs.build.outputs.version }}
+          tag_name: ${{ github.ref_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-macos-intel.yml

@@ -0,0 +1,139 @@
+name: Build macOS App (Intel)
+
+on:
+  push:
+    branches:
+      - "**"
+    tags:
+      - "*"
+  pull_request:
+    branches:
+      - "**"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build macOS Bundle (Intel)
+    runs-on: macos-13
+    outputs:
+      version: ${{ steps.set-version.outputs.version }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Set Version
+        id: set-version
+        shell: bash
+        run: |
+          if [[ "${{ github.ref_type }}" == "tag" ]]; then
+            VERSION=${{ github.ref_name }}
+          elif git describe --tags >/dev/null 2>&1; then
+            VERSION=$(git describe --tags)
+          else
+            VERSION="v0.0.0-$(git rev-parse --short HEAD)"
+          fi
+          if [ -z "$VERSION" ]; then
+            echo "Error: No git version number found!"
+            exit 1
+          fi
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "Version: $VERSION"
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: requirements.txt
+
+      - name: Install Pixi
+        uses: prefix-dev/setup-pixi@v0.8.1
+        with:
+          pixi-version: v0.48.2
+          cache: true
+          cache-key: ${{ github.sha }}-macos-intel
+
+      - name: Install macOS dependencies
+        run: bash scripts/mac_setup.sh --install
+
+      - name: Lint
+        run: pixi run lint
+
+      - name: Test
+        run: pixi run test
+
+      - name: Build macOS artifacts
+        run: |
+          printf "4\n" | bash scripts/mac_build.sh --version "${{ env.VERSION }}"
+
+      - name: Package .app bundle
+        run: |
+          APP_PATH="dist/Rayforge.app"
+          if [ ! -d "$APP_PATH" ]; then
+            echo "App bundle not found at $APP_PATH"
+            exit 1
+          fi
+          ZIP_NAME="rayforge-${{ steps.set-version.outputs.version }}-macos-intel-app.zip"
+          ditto -c -k --keepParent "$APP_PATH" "$ZIP_NAME"
+
+      - name: Rename DMG
+        run: |
+          DMG_PATH="dist/Rayforge_${{ env.VERSION }}.dmg"
+          if [ ! -f "$DMG_PATH" ]; then
+            echo "DMG not found at $DMG_PATH"
+            exit 1
+          fi
+          OUT_DMG="rayforge-${{ steps.set-version.outputs.version }}-macos-intel.dmg"
+          mv "$DMG_PATH" "$OUT_DMG"
+
+      - name: Upload macOS bundle artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rayforge-${{ steps.set-version.outputs.version }}-macos-intel-app.zip
+          path: rayforge-${{ steps.set-version.outputs.version }}-macos-intel-app.zip
+          compression-level: 9
+
+      - name: Upload DMG artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rayforge-${{ steps.set-version.outputs.version }}-macos-intel-dmg
+          path: rayforge-${{ steps.set-version.outputs.version }}-macos-intel.dmg
+
+  release:
+    name: Create GitHub Release (Intel)
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') && github.repository == 'barebaric/rayforge'
+    permissions:
+      contents: write
+    steps:
+      - name: Download macOS app artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: rayforge-${{ needs.build.outputs.version }}-macos-intel-app.zip
+
+      - name: Download DMG artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: rayforge-${{ needs.build.outputs.version }}-macos-intel-dmg
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            rayforge-${{ needs.build.outputs.version }}-macos-intel-app.zip
+            rayforge-${{ needs.build.outputs.version }}-macos-intel.dmg
+          draft: false
+          prerelease: false
+          name: Release ${{ needs.build.outputs.version }}
+          tag_name: ${{ github.ref_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 venv
 .venv
+.venv-mac
 *.swp
 *.py[oc]
 __pycache__

.mac_env

@@ -0,0 +1,10 @@
+export BREW_PREFIX="/usr/local"
+export LIBFFI_PREFIX="/usr/local/opt/libffi"
+export VENV_PATH="$PWD/.venv-mac"
+export PATH="$VENV_PATH/bin:/usr/local/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/Cellar/ffmpeg/4.3.1_2/bin:/usr/local/bin/python3:/usr/local/Cellar/python@3.11/3.11.2_1/bin/python3:/opt/X11/bin:/Library/Apple/usr/bin:/Library/Frameworks/Mono.framework/Versions/Current/Commands:/var/folders/qy/j2t2sz113nl3p_l7kc22ybb80000gn/T/.tmpr0xjAy:/usr/local/opt/node@20/bin:/opt/local/ffmpeg42/lib/pkgconfig:/Applications/Inkscape.app/Contents/MacOS:/opt/local/bin:/opt/local/sbin:/usr/local/opt/coreutils/libexec/gnubin:/usr/local/Cellar/python@3.11/3.11.2_1/Frameworks/Python.framework/Versions/3.11/Python:/usr/local/bin/python:/usr/local/opt/openexr@2/bin:/usr/local/sbin:/Users/pablo/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/Users/pablo/.vscode/extensions/openai.chatgpt-0.4.46-darwin-x64/bin/macos-x86_64"
+export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/opt/local/lib/pkgconfig:/opt/local/ffmpeg42/lib/pkgconfig:/Applications/Inkscape.app/Contents/MacOS:/usr/local/bin:/opt/local/bin:/opt/local/sbin:/usr/local/opt/coreutils/libexec/gnubin:/usr/local/Cellar/python@3.11/3.11.2_1/Frameworks/Python.framework/Versions/3.11/Python:/usr/local/bin/python3:/usr/local/bin/python:/usr/local/opt/openexr@2/bin:/usr/local/sbin:/usr/local/bin:/Users/pablo/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/Cellar/ffmpeg/4.3.1_2/bin:/usr/local/bin/python3:/usr/local/Cellar/python@3.11/3.11.2_1/bin/python3:/opt/X11/bin:/Library/Apple/usr/bin:/Library/Frameworks/Mono.framework/Versions/Current/Commands"
+export GI_TYPELIB_PATH="/usr/local/lib/girepository-1.0:"
+export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:"
+if ! echo "/opt/local/lib/pkgconfig:/opt/local/ffmpeg42/lib/pkgconfig:/Applications/Inkscape.app/Contents/MacOS:/usr/local/bin:/opt/local/bin:/opt/local/sbin:/usr/local/opt/coreutils/libexec/gnubin:/usr/local/Cellar/python@3.11/3.11.2_1/Frameworks/Python.framework/Versions/3.11/Python:/usr/local/bin/python3:/usr/local/bin/python:/usr/local/opt/openexr@2/bin:/usr/local/sbin:/usr/local/bin:/Users/pablo/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/Cellar/ffmpeg/4.3.1_2/bin:/usr/local/bin/python3:/usr/local/Cellar/python@3.11/3.11.2_1/bin/python3:/opt/X11/bin:/Library/Apple/usr/bin:/Library/Frameworks/Mono.framework/Versions/Current/Commands" | tr ':' '\n' | grep -qx "/usr/local/lib/pkgconfig"; then
+  export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/opt/local/lib/pkgconfig:/opt/local/ffmpeg42/lib/pkgconfig:/Applications/Inkscape.app/Contents/MacOS:/usr/local/bin:/opt/local/bin:/opt/local/sbin:/usr/local/opt/coreutils/libexec/gnubin:/usr/local/Cellar/python@3.11/3.11.2_1/Frameworks/Python.framework/Versions/3.11/Python:/usr/local/bin/python3:/usr/local/bin/python:/usr/local/opt/openexr@2/bin:/usr/local/sbin:/usr/local/bin:/Users/pablo/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/Library/Frameworks/Python.framework/Versions/3.7/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/Cellar/ffmpeg/4.3.1_2/bin:/usr/local/bin/python3:/usr/local/Cellar/python@3.11/3.11.2_1/bin/python3:/opt/X11/bin:/Library/Apple/usr/bin:/Library/Frameworks/Mono.framework/Versions/Current/Commands"
+fi

README.md

@@ -67,6 +67,17 @@ For detailed information about developing for Rayforge, including setup instruct
 testing, and contribution guidelines, please see the
 [Developer Documentation](https://rayforge.org/docs/latest/developer/getting-started/).
 
+## macOS build notes
+
+macOS builds rely on Homebrew because libadwaita is not available from the
+conda-forge stack used by the Linux tooling. To prepare a build:
+
+1. Run `scripts/mac_setup.sh --install` to install the native GTK stack
+   (gtk4, libadwaita, libvips, etc.) and write `.mac_env`.
+2. Source the environment with `source .mac_env`.
+3. Build the wheel with `scripts/mac_build.sh`. Pass `--bundle` to also produce
+   a PyInstaller `.app` directory that uses the Homebrew libraries on the host.
+
 ## License
 
 This project is licensed under the **MIT License**. See the `LICENSE` file for details.

Rayforge.spec

@@ -0,0 +1,69 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+from PyInstaller.utils.hooks import collect_submodules
+
+hiddenimports = ['gi._gi_cairo', 'cairosvg']
+hiddenimports += collect_submodules('rayforge.ui_gtk.canvas2d')
+hiddenimports += collect_submodules('rayforge.ui_gtk.canvas2d.elements')
+hiddenimports.append('rayforge.ui_gtk.canvas2d.elements.workpiece')
+
+a = Analysis(
+    ['rayforge/app.py'],
+    pathex=['.'],
+    binaries=[],
+    datas=[
+        ('rayforge/version.txt', 'rayforge'),
+        ('rayforge/resources', 'rayforge/resources'),
+        ('rayforge/locale', 'rayforge/locale'),
+    ],
+    hiddenimports=hiddenimports,
+    hookspath=['hooks'],
+    hooksconfig={
+        'gi': {
+            'module-versions': {
+                'Gtk': '4.0',
+                'Adw': '1',
+            },
+        },
+    },
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='Rayforge',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['rayforge/resources/icons/icon.icns'],
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='Rayforge',
+)
+app = BUNDLE(
+    coll,
+    name='Rayforge.app',
+    icon='rayforge/resources/icons/icon.icns',
+    bundle_identifier='org.rayforge.rayforge',
+)