Skip to content

Commit

Permalink
style: formatted with black
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErikBjare
ErikBjare committed Jun 15, 2021
1 parent 6c39976 commit 93dc456
Showing 1 changed file with 191 additions and 159 deletions.
350 changes: 191 additions & 159 deletions aw.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import flask_restx
import shlex
from pathlib import Path

current_release = subprocess.run(shlex.split("git describe --tags --abbrev=0"), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, encoding="utf8").stdout.strip()
current_release = subprocess.run(
shlex.split("git describe --tags --abbrev=0"),
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
encoding="utf8",
).stdout.strip()
print("bundling activitywatch version " + current_release)

aw_core_path = Path(os.path.dirname(aw_core.__file__))
Expand All @@ -24,9 +29,9 @@ awa_location = Path("aw-watcher-afk")
aww_location = Path("aw-watcher-window")

if platform.system() == "Darwin":
icon = aw_qt_location / 'media/logo/logo.icns'
icon = aw_qt_location / "media/logo/logo.icns"
else:
icon = aw_qt_location / 'media/logo/logo.ico'
icon = aw_qt_location / "media/logo/logo.ico"
block_cipher = None

extra_pathex = []
Expand All @@ -39,77 +44,86 @@ if platform.system() == "Windows":
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'),

(restx_path / 'templates', 'flask_restx/templates'),
(restx_path / 'static', 'flask_restx/static'),
(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=[(aw_server_rust_bin, '.')],
datas=[
(aw_qt_location / 'resources/aw-qt.desktop', 'aw_qt/resources'),
(aw_server_rust_webui, 'aw_server_rust/static'),
],
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)
aw_server_a = Analysis(
["aw-server/__main__.py"],
pathex=[],
binaries=None,
datas=[
(aws_location / "aw_server/static", "aw_server/static"),
(restx_path / "templates", "flask_restx/templates"),
(restx_path / "static", "flask_restx/static"),
(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=[(aw_server_rust_bin, ".")],
datas=[
(aw_qt_location / "resources/aw-qt.desktop", "aw_qt/resources"),
(aw_server_rust_webui, "aw_server_rust/static"),
],
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
Expand All @@ -118,92 +132,110 @@ MERGE(
(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")
(aw_watcher_window_a, "aw-watcher-window", "aw-watcher-window"),
)

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)
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')
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)
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.icns",
# TODO: Get the right version here
"CFBundleShortVersionString": current_release })
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.icns",
# TODO: Get the right version here
"CFBundleShortVersionString": current_release,
},
)

0 comments on commit 93dc456

Please sign in to comment.