From 6b137355b04ff8bd794f564425c674fd594997bf Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Thu, 4 Jan 2024 13:47:24 -0500 Subject: [PATCH] [2127] Move Manifests to Resources Since these are only used by the builder, we can simply update the location of them. I'm not convinced they're all still in use but not convinced enough to remove them. --- build.py | 5 +++-- EDMC.manifest => resources/EDMC.manifest | 0 .../EDMarketConnector-dpiaware+gdiscaling.manifest | 0 .../EDMarketConnector-dpiaware.manifest | 0 .../EDMarketConnector-gdiscaling.manifest | 0 .../EDMarketConnector.manifest | 0 6 files changed, 3 insertions(+), 2 deletions(-) rename EDMC.manifest => resources/EDMC.manifest (100%) rename EDMarketConnector-dpiaware+gdiscaling.manifest => resources/EDMarketConnector-dpiaware+gdiscaling.manifest (100%) rename EDMarketConnector-dpiaware.manifest => resources/EDMarketConnector-dpiaware.manifest (100%) rename EDMarketConnector-gdiscaling.manifest => resources/EDMarketConnector-gdiscaling.manifest (100%) rename EDMarketConnector.manifest => resources/EDMarketConnector.manifest (100%) diff --git a/build.py b/build.py index ad5a9643..0cdf3848 100644 --- a/build.py +++ b/build.py @@ -164,15 +164,16 @@ def build() -> None: "script": "EDMarketConnector.py", "icon_resources": [(0, f"{appname}.ico")], "other_resources": [ - (24, 1, pathlib.Path(f"{appname}.manifest").read_text(encoding="UTF8")) + (24, 1, pathlib.Path(f"resources/{appname}.manifest").read_text(encoding="UTF8")) ], } console_config: dict = { "dest_base": appcmdname, "script": "EDMC.py", + "icon_resources": [(0, f"{appname}.ico")], "other_resources": [ - (24, 1, pathlib.Path(f"{appcmdname}.manifest").read_text(encoding="UTF8")) + (24, 1, pathlib.Path(f"resources/{appcmdname}.manifest").read_text(encoding="UTF8")) ], } diff --git a/EDMC.manifest b/resources/EDMC.manifest similarity index 100% rename from EDMC.manifest rename to resources/EDMC.manifest diff --git a/EDMarketConnector-dpiaware+gdiscaling.manifest b/resources/EDMarketConnector-dpiaware+gdiscaling.manifest similarity index 100% rename from EDMarketConnector-dpiaware+gdiscaling.manifest rename to resources/EDMarketConnector-dpiaware+gdiscaling.manifest diff --git a/EDMarketConnector-dpiaware.manifest b/resources/EDMarketConnector-dpiaware.manifest similarity index 100% rename from EDMarketConnector-dpiaware.manifest rename to resources/EDMarketConnector-dpiaware.manifest diff --git a/EDMarketConnector-gdiscaling.manifest b/resources/EDMarketConnector-gdiscaling.manifest similarity index 100% rename from EDMarketConnector-gdiscaling.manifest rename to resources/EDMarketConnector-gdiscaling.manifest diff --git a/EDMarketConnector.manifest b/resources/EDMarketConnector.manifest similarity index 100% rename from EDMarketConnector.manifest rename to resources/EDMarketConnector.manifest