diff --git a/build.py b/build.py index 596b64fb..1bc96765 100644 --- a/build.py +++ b/build.py @@ -81,6 +81,7 @@ def generate_data_files( "ships.json", "ships.p", # TODO: Remove in 6.0 f"{app_name}.ico", + f"resources/{appcmdname}.ico", "EDMarketConnector - TRACE.bat", "EDMarketConnector - localserver-auth.bat", "EDMarketConnector - reset-ui.bat", @@ -171,7 +172,7 @@ def build() -> None: console_config: dict = { "dest_base": appcmdname, "script": "EDMC.py", - "icon_resources": [(0, f"{appname}.ico")], + "icon_resources": [(0, f"resources/{appcmdname}.ico")], "other_resources": [ (24, 1, pathlib.Path(f"resources/{appcmdname}.manifest").read_text(encoding="UTF8")) ], @@ -185,7 +186,8 @@ def build() -> None: data_files=data_files, options=options, ) - except FileNotFoundError: + except FileNotFoundError as err: + print(err) sys.exit( "Build Failed due to Missing Files! Have you set up your submodules? \n" "https://github.com/EDCD/EDMarketConnector/wiki/Running-from-source" diff --git a/config/__init__.py b/config/__init__.py index 7e5025a6..5dfb0d24 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -57,7 +57,7 @@ appcmdname = 'EDMC' _static_appversion = '5.10.1' _cached_version: semantic_version.Version | None = None -copyright = '© 2015-2019 Jonathan Harris, 2020-2023 EDCD' +copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD' update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' update_interval = 8*60*60 # 8 Hours diff --git a/resources/EDMC_Installer_Config_template.txt b/resources/EDMC_Installer_Config_template.txt index b72ed507..de40630c 100644 --- a/resources/EDMC_Installer_Config_template.txt +++ b/resources/EDMC_Installer_Config_template.txt @@ -16,7 +16,7 @@ AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#SuppURL} AppUpdatesURL={#SuppURL} -AppCopyright=Copyright (C) 2015-2019 Jonathan Harris, 2020-2023 EDCD +AppCopyright=Copyright (C) 2015-2019 Jonathan Harris, 2020-2024 EDCD AllowUNCPath=no AllowNetworkDrive=no DefaultDirName={autopf}\{#MyAppName} diff --git a/resources/edmc.ico b/resources/edmc.ico new file mode 100644 index 00000000..8f3f9ff4 Binary files /dev/null and b/resources/edmc.ico differ diff --git a/resources/io.edcd.EDMarketConnector.cmd.psd b/resources/io.edcd.EDMarketConnector.cmd.psd new file mode 100644 index 00000000..6bebc572 Binary files /dev/null and b/resources/io.edcd.EDMarketConnector.cmd.psd differ