diff --git a/build-macos.py b/build-macos.py index cc99f62..7eaab3a 100644 --- a/build-macos.py +++ b/build-macos.py @@ -1,23 +1,24 @@ import os import py2app import shutil - -from distutils.core import setup +from setuptools import setup def tree(src): - return [(root, map(lambda f: os.path.join(root, f), files)) - for (root, dirs, files) in os.walk(os.path.normpath(src))] - + data_files = [] + for (root, dirs, files) in os.walk(os.path.normpath(src)): + files_list = [os.path.join(root, f) for f in files] + if files_list: + data_files.append((root, files_list)) + return data_files if os.path.exists('build'): shutil.rmtree('build') - if os.path.exists('dist/index.app'): shutil.rmtree('dist/index.app') ENTRY_POINT = ['src/index.py'] - DATA_FILES = tree('gui') + OPTIONS = { 'argv_emulation': False, 'strip': False, @@ -26,11 +27,11 @@ def tree(src): 'plist': { 'NSRequiresAquaSystemAppearance': False }, - 'resources': DATA_FILES } setup( app=ENTRY_POINT, + data_files=DATA_FILES, options={'py2app': OPTIONS}, setup_requires=['py2app'], ) diff --git a/requirements.txt b/requirements.txt index 1d57483..3df8254 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools +setuptools<71.0.2 pywebview pyinstaller; sys_platform != 'darwin' -py2app; sys_platform == 'darwin' \ No newline at end of file +py2app; sys_platform == 'darwin'