From bb65718cef0703c8f1c3723a4314d7f71ae59063 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 3 Dec 2021 12:21:36 +0000
Subject: [PATCH] Python 3.10: Final adjustments to .wxs file

We were missing some new files which seemed to be the cause of issues
with the definitely included and installed _tkinter.pyd.  I think it was
due to missing _win32sysloader.pyd but didn't test in detail.
---
 EDMarketConnector.wxs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index d56dff92..621aafa2 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -146,6 +146,12 @@
 					<Component Guid="{D2F0CDD2-E934-419F-BC99-445E8FD3AF24}">
 						<File KeyPath="yes" Source="SourceDir\_tkinter.pyd" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\_uuid.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\_win32sysloader.pyd" />
+					</Component>
 					<Component Guid="{62DF41B7-0BE8-48F3-BB22-90E9201A6D8C}">
 						<File KeyPath="yes" Source="SourceDir\cacert.pem" />
 					</Component>
@@ -188,6 +194,12 @@
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\python310.dll" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\pythoncom310.dll" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\pywintypes310.dll" />
+					</Component>
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\rare_commodity.csv" />
 					</Component>
@@ -215,6 +227,15 @@
 					<Component Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">
 						<File KeyPath="yes" Source="SourceDir\unicodedata.pyd" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32api.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32com.shell.shell.pyd" />
+					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\win32evtlog.pyd" />
+					</Component>
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\winsound.pyd" />
 					</Component>
@@ -561,6 +582,8 @@
 			<ComponentRef Id="_sqlite3.pyd" />
 			<ComponentRef Id="_ssl.pyd" />
 			<ComponentRef Id="_tkinter.pyd" />
+			<ComponentRef Id="_uuid.pyd" />
+			<ComponentRef Id="_win32sysloader.pyd" />
 			<ComponentRef Id="cacert.pem" />
 			<ComponentRef Id="ChangeLog.md" />
 			<ComponentRef Id="commodity.csv" />
@@ -589,6 +612,8 @@
 			<ComponentRef Id="pt_PT.strings" />
 			<ComponentRef Id="pyexpat.pyd" />
 			<ComponentRef Id="python310.dll" />
+			<ComponentRef Id="pythoncom310.dll" />
+			<ComponentRef Id="pywintypes310.dll" />
 			<ComponentRef Id="rare_commodity.csv" />
 			<ComponentRef Id="ru.strings" />
 			<ComponentRef Id="select.pyd" />
@@ -604,6 +629,9 @@
 			<ComponentRef Id="tk86t.dll" />
 			<ComponentRef Id="uk.strings" />
 			<ComponentRef Id="unicodedata.pyd" />
+			<ComponentRef Id="win32api.pyd" />
+			<ComponentRef Id="win32com.shell.shell.pyd" />
+			<ComponentRef Id="win32evtlog.pyd" />
 			<ComponentRef Id="winsound.pyd" />
 			<ComponentRef Id="WinSparkle.dll" />
 			<ComponentRef Id="EDMarketConnector_TRACE.bat" />