codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Build] Fix entry point build errors 

Fixed a mistake settings entry points in setup.py. Replaced with simpler
logic since gui_scripts only affect Windows.

Fixed entry point changes affecting pyinstaller build

Corrected deluge-web.exe to have no console instead of
deluge-web-debug.exe
This commit is contained in:
Calum Lind 2022-02-06 21:02:43 +00:00
parent 2fb41341c9
commit e87236514d
No known key found for this signature in database
GPG Key ID: 90597A687B836BA3
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/win/delugewin.spec
View File

@ -125,7 +125,7 @@ executables = {
'console': True, 'console': True,
'gtk': False, 'gtk': False,
}, },
'deluged-script.py': { 'deluged-script.pyw': {
'name': 'deluged', 'name': 'deluged',
'console': False, 'console': False,
'gtk': False, 'gtk': False,
@ -137,12 +137,12 @@ executables = {
}, },
'deluge-web-debug-script.py': { 'deluge-web-debug-script.py': {
'name': 'deluge-web-debug', 'name': 'deluge-web-debug',
'console': False, 'console': True,
'gtk': False, 'gtk': False,
}, },
'deluge-web-script.py': { 'deluge-web-script.pyw': {
'name': 'deluge-web', 'name': 'deluge-web',
'console': True, 'console': False,
'gtk': False, 'gtk': False,
}, },
} }

17
setup.py
View File

@ -479,15 +479,21 @@ if not windows_check() and not osx_check():
if os.path.isfile(appdata_data): if os.path.isfile(appdata_data):
_data_files.append(('share/appdata', [appdata_data])) _data_files.append(('share/appdata', [appdata_data]))
# Entry Points
_entry_points['console_scripts'] = [ _entry_points['console_scripts'] = [
'deluge-console = deluge.ui.console:start', 'deluge-console = deluge.ui.console:start',
] ]
# On Windows use gui_scripts to hide cmd popup
script_type = 'gui_scripts' if windows_check() else 'console_scripts' # On Windows use gui_scripts to hide cmd popup (no effect on Linux/MacOS)
_entry_points[script_type] = [ _entry_points['gui_scripts'] = [
'deluge = deluge.ui.ui_entry:start_ui',
'deluge-gtk = deluge.ui.gtk3:start',
'deluge-web = deluge.ui.web:start', 'deluge-web = deluge.ui.web:start',
'deluged = deluge.core.daemon_entry:start_daemon', 'deluged = deluge.core.daemon_entry:start_daemon',
] ]
# Provide Windows 'debug' exes for stdin/stdout e.g. logging/errors
if windows_check(): if windows_check():
_entry_points['console_scripts'].extend( _entry_points['console_scripts'].extend(
[ [
@ -496,10 +502,7 @@ if windows_check():
'deluged-debug = deluge.core.daemon_entry:start_daemon', 'deluged-debug = deluge.core.daemon_entry:start_daemon',
] ]
) )
_entry_points['gui_scripts'] = [
'deluge = deluge.ui.ui_entry:start_ui',
'deluge-gtk = deluge.ui.gtk3:start',
]
_entry_points['deluge.ui'] = [ _entry_points['deluge.ui'] = [
'console = deluge.ui.console:Console', 'console = deluge.ui.console:Console',
'web = deluge.ui.web:Web', 'web = deluge.ui.web:Web',