Skip to content

Commit

Permalink
Working .app package
Browse files Browse the repository at this point in the history 
require version 4.0 of pyinstaller for building mega-bundle
  • Loading branch information
@xylix
xylix committed Dec 30, 2019
1 parent 1c68175 commit 3c19049
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 94 deletions.
4 changes: 4 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ test-integration:
# Example: https://ci.appveyor.com/project/ErikBjare/activitywatch/build/1.0.167/job/k1ulexsc5ar5uv4v
pytest ./scripts/tests/integration_tests.py ./aw-server/tests/ -v

pyinstaller:
pip install -r requirements.txt
pyinstaller --clean --noconfirm --windowed aw.spec

package:
mkdir -p dist/activitywatch
#
Expand Down
272 changes: 178 additions & 94 deletions aw.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,111 +2,195 @@
# vi: set ft=python :

import os

import platform
import aw_core
aw_core_path = os.path.dirname(aw_core.__file__)

import flask_restplus
# TODO: These are here for IDE analysis, remove before merging
# from PyInstaller.building.api import MERGE, COLLECT, EXE, PYZ
# from PyInstaller.building.build_main import Analysis
# from PyInstaller.building.osx import BUNDLE

aw_core_path = os.path.dirname(aw_core.__file__)
restplus_path = os.path.dirname(flask_restplus.__file__)

aws_location = "aw-server/"
aw_qt_location = "aw-qt/"
awa_location = "aw-watcher-afk/"
aww_location = "aw-watcher-window/"

icon = aw_qt_location + 'media/logo/logo.ico'
block_cipher = None

aw_server_analysis = Analysis(['aw-server/__main__.py'],
pathex=[],
binaries=None,
datas=[
('aw_server/static', 'aw_server/static'),

(os.path.join(restplus_path, 'templates'), 'flask_restplus/templates'),
(os.path.join(restplus_path, 'static'), 'flask_restplus/static'),
(os.path.join(aw_core_path, 'schemas'), 'aw_core/schemas')
],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_qt_analysis = Analysis(['aw_qt/__main__.py'],
pathex=[] + extra_pathex,
binaries=None,
datas=[('resources/aw-qt.desktop', '.')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_watcher_afk_analysis = Analysis(['aw_watcher_afk/__main__.py'],
pathex=[],
binaries=None,
datas=None,
hiddenimports=[
'Xlib.keysymdef.miscellany',
'Xlib.keysymdef.latin1',
'Xlib.keysymdef.latin2',
'Xlib.keysymdef.latin3',
'Xlib.keysymdef.latin4',
'Xlib.keysymdef.greek',
'Xlib.support.unix_connect',
'Xlib.ext.shape',
'Xlib.ext.xinerama',
'Xlib.ext.composite',
'Xlib.ext.randr',
'Xlib.ext.xfixes',
'Xlib.ext.security',
'Xlib.ext.xinput',
],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_watcher_window_analysis = Analysis(['aw_watcher_window/__main__.py'],
pathex=[],
binaries=None,
datas=[("aw_watcher_window/printAppTitle.scpt", "aw_watcher_window")],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)
extra_pathex = []
if platform.system() == "Windows":
# The Windows version includes paths to Qt binaries which are
# not automatically found due to bug in PyInstaller 3.2.
# See: https://github.com/pyinstaller/pyinstaller/issues/2152
import PyQt5

pyqt_path = os.path.dirname(PyQt5.__file__)
extra_pathex.append(pyqt_path + "\\Qt\\bin")

aw_server_a = Analysis(['aw-server/__main__.py'],
pathex=[],
binaries=None,
datas=[
(aws_location + 'aw_server/static', 'aw_server/static'),

(os.path.join(restplus_path, 'templates'), 'flask_restplus/templates'),
(os.path.join(restplus_path, 'static'), 'flask_restplus/static'),
(os.path.join(aw_core_path, 'schemas'), 'aw_core/schemas')
],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_qt_a = Analysis([aw_qt_location + 'aw_qt/__main__.py'],
pathex=[] + extra_pathex,
binaries=None,
datas=[(aw_qt_location + 'resources/aw-qt.desktop', 'aw_qt/resources')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_watcher_afk_a = Analysis([awa_location + 'aw_watcher_afk/__main__.py'],
pathex=[],
binaries=None,
datas=None,
hiddenimports=[
'Xlib.keysymdef.miscellany',
'Xlib.keysymdef.latin1',
'Xlib.keysymdef.latin2',
'Xlib.keysymdef.latin3',
'Xlib.keysymdef.latin4',
'Xlib.keysymdef.greek',
'Xlib.support.unix_connect',
'Xlib.ext.shape',
'Xlib.ext.xinerama',
'Xlib.ext.composite',
'Xlib.ext.randr',
'Xlib.ext.xfixes',
'Xlib.ext.security',
'Xlib.ext.xinput',
],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

aw_watcher_window_a = Analysis([aww_location + 'aw_watcher_window/__main__.py'],
pathex=[],
binaries=None,
datas=[(aww_location + "aw_watcher_window/printAppTitle.scpt", 'aw_watcher_window')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)

# https://pythonhosted.org/PyInstaller/spec-files.html#multipackage-bundles
# MERGE takes a bit weird arguments, it wants tuples which consists of
# the analysis paired with the script name and the bin name
MERGE(
(aw_server_analysis, "aw-server", "aw-server"),
(aw_qt_analysis, "aw-qt", "aw-qt"),
(aw_watcher_afk_analysis, "aw-watcher-afk", "aw-watcher-afk"),
(aw_watcher_window_analysis, "aw-watcher-window", "aw-watcher-afk")
(aw_server_a, "aw-server", "aw-server"),
(aw_qt_a, "aw-qt", "aw-qt"),
(aw_watcher_afk_a, "aw-watcher-afk", "aw-watcher-afk"),
(aw_watcher_window_a, "aw-watcher-window", "aw-watcher-window")
)

pyz = PYZ(aw_watcher_window_analysis.pure, aw_watcher_window_analysis.zipped_data,
aww_pyz = PYZ(aw_watcher_window_a.pure, aw_watcher_window_a.zipped_data,
cipher=block_cipher)
aww_exe = EXE(aww_pyz,
aw_watcher_window_a.scripts,
exclude_binaries=True,
name='aw-watcher-window',
debug=False,
strip=False,
upx=True,
console=True)
aww_coll = COLLECT(aww_exe,
aw_watcher_window_a.binaries,
aw_watcher_window_a.zipfiles,
aw_watcher_window_a.datas,
strip=False,
upx=True,
name='aw-watcher-window')

awa_pyz = PYZ(aw_watcher_afk_a.pure, aw_watcher_afk_a.zipped_data,
cipher=block_cipher)
awa_exe = EXE(awa_pyz,
aw_watcher_afk_a.scripts,
exclude_binaries=True,
name='aw-watcher-afk',
debug=False,
strip=False,
upx=True,
console=True)
awa_coll = COLLECT(awa_exe,
aw_watcher_afk_a.binaries,
aw_watcher_afk_a.zipfiles,
aw_watcher_afk_a.datas,
strip=False,
upx=True,
name='aw-watcher-afk')

aws_pyz = PYZ(aw_server_a.pure, aw_server_a.zipped_data,
cipher=block_cipher)

aws_exe = EXE(aws_pyz,
aw_server_a.scripts,
exclude_binaries=True,
name='aw-server',
debug=False,
strip=False,
upx=True,
console=True)
aws_coll = COLLECT(aws_exe,
aw_server_a.binaries,
aw_server_a.zipfiles,
aw_server_a.datas,
strip=False,
upx=True,
name='aw-server')

awq_pyz = PYZ(aw_qt_a.pure, aw_qt_a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
aw_watcher_window_analysis.scripts,
exclude_binaries=True,
name='aw-watcher-window',
debug=False,
strip=False,
upx=True,
console=True)
coll = COLLECT(exe,
aw_watcher_window_analysis.binaries,
aw_watcher_window_analysis.zipfiles,
aw_watcher_window_analysis.datas,
strip=False,
upx=True,
name='aw-watcher-window')


COLLECT()
awq_exe = EXE(awq_pyz,
aw_qt_a.scripts,
exclude_binaries=True,
name='aw-qt',
debug=True,
strip=False,
upx=True,
icon=icon,
console=False if platform.system() == "Windows" else True)
awq_coll = COLLECT(awq_exe,
aw_qt_a.binaries,
aw_qt_a.zipfiles,
aw_qt_a.datas,
strip=False,
upx=True,
name='aw-qt')

if platform.system() == "Darwin":
app = BUNDLE(awq_coll,
aww_coll,
awa_coll,
aws_coll,
name="ActivityWatch.app",
icon=icon,
bundle_identifier="ActivityWatch",
info_plist={"CFBundleExecutable": "MacOS/aw-qt",
"CFBundleIconFile": "logo.ico"})
3 changes: 3 additions & 0 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Currently use `pip install https://github.com/pyinstaller/pyinstaller/tarball/develop`
# To install develop version of pyinstaller which has multi-bundles fixed
PyInstaller==4.0.dev0+9dd34bdfba

0 comments on commit 3c19049

Please sign in to comment.