Skip to content
Permalink
Browse files

Remove unused py2app make target, setup.py options

  • Loading branch information...
crwood committed Apr 10, 2019
1 parent bddebd9 commit 3d8be0a16e9b33a54063850133b12ca4a060d3fc
Showing with 0 additions and 55 deletions.
  1. +0 −25 Makefile
  2. +0 −30 setup.py
@@ -183,31 +183,6 @@ pyinstaller:
export PYTHONHASHSEED=1 && \
python -m PyInstaller -y misc/gridsync.spec

py2app:
if [ -f dist/Tahoe-LAFS.zip ] ; then \
python -m zipfile -e dist/Tahoe-LAFS.zip dist ; \
else \
make frozen-tahoe ; \
fi;
python3 -m virtualenv --clear --python=python3 build/venv-py2app
source build/venv-py2app/bin/activate && \
python -m pip install --upgrade pip && \
python -m pip install -r requirements/requirements-hashes.txt && \
case `uname` in \
Darwin) \
python scripts/maybe_rebuild_libsodium.py && \
python scripts/maybe_downgrade_pyqt.py \
;; \
esac && \
python -m pip install . && \
python -m pip install py2app && \
python -m pip list && \
python setup.py py2app && \
python scripts/strip_py2app_bundle.py
cp -r gridsync/resources dist/Gridsync.app/Contents/MacOS
cp -r dist/Tahoe-LAFS dist/Gridsync.app/Contents/MacOS
touch dist/Gridsync.app

dmg:
python3 -m virtualenv --clear --python=python2 build/venv-dmg
source build/venv-dmg/bin/activate && \
@@ -1,6 +1,5 @@
#!/usr/bin/env python3

from configparser import RawConfigParser
import re
import struct
import sys
@@ -47,34 +46,6 @@
version = re.findall(r"__version__\s*=\s*'([^']+)'", version_file)[0]


if sys.platform == 'darwin':
config = RawConfigParser()
config.read('gridsync/resources/config.txt')
app_name = config.get('application', 'name')
build_settings = {}
for option, value in config.items('build'):
build_settings[option] = value
extra_options = {
'setup_requires': ['py2app'],
'app': ['gridsync/cli.py'],
'options': {'py2app': {
'argv_emulation': True,
'iconfile': build_settings['mac_icon'],
'includes': ['cffi'],
'plist': {
'CFBundleDisplayName': app_name,
'CFBundleExecutable': app_name,
'CFBundleIdentifier': build_settings['mac_bundle_identifier'],
'CFBundleName': app_name,
'LSBackgroundOnly': True,
'LSUIElement': True
}
}}
}
else:
extra_options = {}


setup(
name="gridsync",
version=version,
@@ -132,5 +103,4 @@
'console_scripts': ['gridsync=gridsync.cli:main'],
},
install_requires=requirements,
**extra_options
)

0 comments on commit 3d8be0a

Please sign in to comment.
You can’t perform that action at this time.