Merge pull request #43 from jessielw/copilot/create-app-package-macos

Add macOS .app bundle packaging and Intel (x86_64) architecture support

Author: jessielw

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
           path: pyinstaller_build/bundled_mode/Mp4Forge/
           retention-days: 90
 
-  build-macos:
+  build-macos-arm64:
     runs-on: macos-latest
 
     steps:
@@ -62,8 +62,37 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Mp4Forge-macOS
-          path: pyinstaller_build/bundled_mode/Mp4Forge/
+          name: Mp4Forge-macOS-ARM64
+          path: pyinstaller_build/bundled_mode/Mp4Forge.app/
+          retention-days: 90
+
+  build-macos-intel:
+    runs-on: macos-15-intel
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Build desktop app
+        run: uv run python build_desktop.py
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Mp4Forge-macOS-Intel
+          path: pyinstaller_build/bundled_mode/Mp4Forge.app/
           retention-days: 90
 
   build-linux:
@@ -96,7 +125,7 @@ jobs:
           retention-days: 90
 
   create-release:
-    needs: [build-windows, build-macos, build-linux]
+    needs: [build-windows, build-macos-arm64, build-macos-intel, build-linux]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
 
@@ -109,11 +138,17 @@ jobs:
           name: Mp4Forge-Windows
           path: ./dist/windows
 
-      - name: Download macOS artifact
+      - name: Download macOS ARM64 artifact
         uses: actions/download-artifact@v4
         with:
-          name: Mp4Forge-macOS
-          path: ./dist/macos
+          name: Mp4Forge-macOS-ARM64
+          path: ./dist/macos-arm64
+
+      - name: Download macOS Intel artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: Mp4Forge-macOS-Intel
+          path: ./dist/macos-intel
 
       - name: Download Linux artifact
         uses: actions/download-artifact@v4
@@ -128,9 +163,15 @@ jobs:
           zip -r archives/Mp4Forge-Windows.zip Mp4Forge
           mv Mp4Forge dist/windows
 
-          mv dist/macos Mp4Forge
-          zip -r archives/Mp4Forge-macOS.zip Mp4Forge
-          mv Mp4Forge dist/macos
+          # macOS ARM64 .app bundle
+          cd dist/macos-arm64
+          zip -r ../../archives/Mp4Forge-macOS-ARM64.zip Mp4Forge.app
+          cd ../..
+
+          # macOS Intel .app bundle
+          cd dist/macos-intel
+          zip -r ../../archives/Mp4Forge-macOS-Intel.zip Mp4Forge.app
+          cd ../..
 
           mv dist/linux Mp4Forge
           tar czf archives/Mp4Forge-Linux.tar.gz Mp4Forge
@@ -141,7 +182,8 @@ jobs:
         with:
           files: |
             archives/Mp4Forge-Windows.zip
-            archives/Mp4Forge-macOS.zip
+            archives/Mp4Forge-macOS-ARM64.zip
+            archives/Mp4Forge-macOS-Intel.zip
             archives/Mp4Forge-Linux.tar.gz
           draft: true
           prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}

README.md

@@ -48,12 +48,14 @@ A modern MP4 muxing tool with a desktop GUI interface, powered by MP4Box.
 1. Go to the [Releases](https://github.com/jessielw/MP4-Mux-Tool/releases) page
 2. Download the archive for your platform:
    - **Windows**: `Mp4Forge-Windows.zip`
-   - **macOS**: `Mp4Forge-macOS.zip`
+   - **macOS (Apple Silicon)**: `Mp4Forge-macOS-ARM64.zip`
+   - **macOS (Intel)**: `Mp4Forge-macOS-Intel.zip`
    - **Linux**: `Mp4Forge-Linux.tar.gz`
 3. Extract the archive
-4. Run the executable:
-   - Windows: `Mp4Forge.exe`
-   - macOS/Linux: `./Mp4Forge`
+4. Run the application:
+   - **Windows**: Run `Mp4Forge.exe`
+   - **macOS**: Extract the .zip and drag `Mp4Forge.app` to your Applications folder, then launch from Launchpad or Finder
+   - **Linux**: Run `./Mp4Forge`
 
 ### Option 2: Run from Source
 

build_desktop.py

@@ -4,11 +4,26 @@
 from pathlib import Path
 from subprocess import run
 
+# Import macOS app builder if on macOS
+if platform.system() == "Darwin":
+    from build_macos_app import create_app_bundle
+
 
 def get_executable_extension() -> str:
     return ".exe" if platform.system() == "Windows" else ""
 
 
+def load_toml(file_path: Path) -> dict:
+    """Load TOML file, handling different Python versions."""
+    try:
+        import tomllib
+    except ImportError:
+        import tomli as tomllib
+    
+    with open(file_path, "rb") as f:
+        return tomllib.load(f)
+
+
 # def get_site_packages() -> Path:
 #     output = run(
 #         ("uv", "pip", "show", "PySide6"),
@@ -109,14 +124,41 @@ def build_app():
 
     # Check onedir (bundle) build
     onedir_path = Path("bundled_mode") / "Mp4Forge" / f"Mp4Forge{exe_str}"
-    if onedir_path.is_file() and str(build_job_onedir.returncode) == "0":
+    build_succeeded = onedir_path.is_file() and str(build_job_onedir.returncode) == "0"
+    
+    if build_succeeded:
         success_msgs.append(f"Bundle build success! Path: {Path.cwd() / onedir_path}")
     else:
         success_msgs.append("Bundle build did not complete successfully")
 
+    # Store absolute path before changing directory
+    pyinstaller_output = pyinstaller_folder / "bundled_mode"
+
     # change directory back to original directory
     os.chdir(desktop_script.parent)
 
+    # On macOS, create a proper .app bundle
+    if platform.system() == "Darwin" and build_succeeded:
+        try:
+            # Get version from pyproject.toml
+            pyproject_path = project_root / "pyproject.toml"
+            pyproject = load_toml(pyproject_path)
+            version = pyproject["project"]["version"]
+
+            # Create .app bundle (pyinstaller_output already defined above)
+            icon_png = project_root / "runtime" / "images" / "mp4.png"
+
+            app_bundle = create_app_bundle(
+                pyinstaller_output_dir=pyinstaller_output,
+                app_name="Mp4Forge",
+                version=version,
+                bundle_identifier="io.github.jessielw.mp4forge",
+                icon_path=icon_png if icon_png.exists() else None,
+            )
+            success_msgs.append(f"macOS app bundle created: {app_bundle}")
+        except Exception as e:
+            success_msgs.append(f"Warning: Failed to create .app bundle: {e}")
+
     return "\n".join(success_msgs)