add custom py2app recipe

Author: xXJSONDeruloXx

.github/workflows/macOS-build.yaml

@@ -35,17 +35,26 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
           pip install py2app
+          echo "Installed packages:"
+          pip list
+
+      - name: Check tkinterdnd2 installation
+        run: |
+          python -c "import tkinterdnd2; print('tkinterdnd2 location:', tkinterdnd2.__file__)"
+          python -c "import tkinterdnd2; import os; print('tkinterdnd2 contents:'); [print(f) for f in os.listdir(os.path.dirname(tkinterdnd2.__file__))]"
 
       - name: Build macOS App with py2app (Alias Mode)
         run: |
           echo "Starting py2app build in alias mode for testing..."
-          python setup.py py2app -A 2>&1 | tee build_alias.log || true
+          python setup_py2app.py py2app -A 2>&1 | tee build_alias.log || true
           
       - name: Build macOS App with py2app (Full Build)
         run: |
           echo "Starting py2app full build..."
-          python setup.py py2app --verbose 2>&1 | tee build.log
-          echo "Build command completed with exit code: $?"
+          python setup_py2app.py py2app 2>&1 | tee build.log
+          BUILD_EXIT=$?
+          echo "Build command completed with exit code: $BUILD_EXIT"
+          exit $BUILD_EXIT
 
       - name: Verify Build
         run: |

setup_py2app.py

@@ -0,0 +1,106 @@
+"""
+Custom py2app recipe for handling tkinterdnd2
+This ensures the native libraries are properly included in the macOS app bundle
+"""
+from setuptools import setup
+import os
+import sys
+from pathlib import Path
+import shutil
+
+APP = ['main.py']
+
+# Collect all resource files
+DATA_FILES = []
+res_dir = Path('res')
+if res_dir.exists():
+    for root, dirs, files in os.walk(res_dir):
+        for file in files:
+            file_path = os.path.join(root, file)
+            # Add to Resources folder in the app bundle
+            DATA_FILES.append((os.path.dirname(file_path), [file_path]))
+
+# Find tkinterdnd2 package and its native libraries
+try:
+    import tkinterdnd2
+    tkdnd_path = Path(tkinterdnd2.__file__).parent
+    
+    # Add tkinterdnd2 data files
+    for item in tkdnd_path.glob('**/*'):
+        if item.is_file():
+            # Include .dylib, .so, .tcl files
+            if item.suffix in ['.dylib', '.so', '.tcl', '.tm']:
+                rel_path = item.relative_to(tkdnd_path.parent)
+                DATA_FILES.append((str(rel_path.parent), [str(item)]))
+                print(f"Including tkinterdnd2 file: {item}")
+except ImportError:
+    print("Warning: tkinterdnd2 not found, app may not work correctly")
+
+OPTIONS = {
+    'argv_emulation': True,
+    'packages': [
+        'tkinter',
+        'PIL',
+        'py7zr',
+        'requests',
+        'psutil',
+    ],
+    'includes': [
+        'tkinterdnd2',
+        'tkinterdnd2.TkinterDnD',
+        'lib',
+        'lib.gui',
+        'lib.gui.style',
+        'lib.gui.context',
+        'lib.gui.button',
+        'lib.gui.terminal',
+        'lib.spruce',
+        'lib.window_manager',
+        'lib.sd_card',
+        'lib.usb_flasher',
+        'lib.progress',
+        'lib.debug',
+        'apps',
+        'apps.sd_flasher',
+        'apps.sd_flasher._main',
+        'apps.sd_flasher.events',
+        'apps.sd_flasher.format',
+        'apps.sd_flasher.fresh_install',
+        'apps.sd_flasher.update_firmware',
+        'apps.sd_flasher.update',
+        'apps.settings',
+        'apps.settings._main',
+        'apps.template',
+        'apps.template._main',
+        'apps.template.external_functions',
+    ],
+    'excludes': [
+        'matplotlib',
+        'numpy',
+        'scipy',
+        'pandas',
+        'test',
+        'tests',
+        'unittest',
+    ],
+    'strip': False,
+    'optimize': 0,
+    'compressed': False,  # Don't compress for easier debugging
+    'plist': {
+        'CFBundleName': 'Pixel Panel',
+        'CFBundleDisplayName': 'Pixel Panel',
+        'CFBundleIdentifier': 'com.spruceui.pixelpanel',
+        'CFBundleVersion': '1.0.0',
+        'CFBundleShortVersionString': '1.0.0',
+        'NSHighResolutionCapable': True,
+        'LSMinimumSystemVersion': '10.13.0',
+    },
+}
+
+setup(
+    name='Pixel Panel',
+    app=APP,
+    data_files=DATA_FILES,
+    options={'py2app': OPTIONS},
+    setup_requires=['py2app'],
+)