diff --git a/dist_assets/mac/pyfa.spec b/dist_assets/mac/pyfa.spec index f25f01e28a..2d86325feb 100644 --- a/dist_assets/mac/pyfa.spec +++ b/dist_assets/mac/pyfa.spec @@ -65,20 +65,28 @@ pyz = PYZ(a.pure, a.zipped_data, exe = EXE(pyz, a.scripts, - a.binaries, - a.zipfiles, - a.datas, + exclude_binaries=True, name='pyfa', debug=False, strip=False, upx=True, - runtime_tmpdir=None, console=False , icon=icon, + contents_directory='app', ) -app = BUNDLE( +coll = COLLECT( exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + name='pyfa', +) + +app = BUNDLE( + coll, name='pyfa.app', version=os.getenv('PYFA_VERSION'), icon=icon, diff --git a/pyfa.spec b/pyfa.spec index 33fb64e0ad..dd03b53c41 100644 --- a/pyfa.spec +++ b/pyfa.spec @@ -116,7 +116,7 @@ if platform.system() == 'Darwin': 'CFBundleVersion': '1.2.3', 'CFBundleShortVersionString': '1.2.3', } - app = BUNDLE(exe, + app = BUNDLE(coll, name='pyfa.app', icon=icon, bundle_identifier=None, diff --git a/scripts/osx-package.sh b/scripts/osx-package.sh index bbfe3bdaa9..e9f5eaa5e8 100644 --- a/scripts/osx-package.sh +++ b/scripts/osx-package.sh @@ -7,5 +7,5 @@ echo "Building distributive..." python3 -m PyInstaller -y --clean dist_assets/mac/pyfa.spec echo "Compressing distributive..." cd dist -zip -r "pyfa-$PYFA_VERSION-mac.zip" pyfa.app +zip -yr "pyfa-$PYFA_VERSION-mac.zip" pyfa.app md5 -r "pyfa-$PYFA_VERSION-mac.zip"