From 1f1946f80d84104f8c499304a06dee0820f6e0eb Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Thu, 26 Sep 2019 15:39:42 +0100
Subject: [PATCH] Force inclusion of sqlite3.dll

  *) There's a bug in py2exe meaning sqlite3.dll doesn't get pulled in
    by listing it in packages.  So we fudge it, assuming it's in
    <sys.base_prefix>/DLLs/sqlite3.dll (which is the case for Python 3.2
    32-bit on Windows).

    Bug report filed:

    	<https://github.com/albertosottile/py2exe/issues/23>

  *) Adds sqlite3.dll back into .wxs file
---
 EDMarketConnector.wxs | 4 ++++
 setup.py              | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 421e91fb..3c8a4aa7 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -212,6 +212,9 @@
 					<Component Id="_socket.pyd" Guid="*">
 			                    <File Id="_socket.pyd" KeyPath="yes" Source="SourceDir\_socket.pyd" />
 			                </Component>
+					<Component Id="sqlite3.dll" Guid="*">
+						<File Id="sqlite3.dll" KeyPath="yes" Source="SourceDir\sqlite3.dll" />
+					</Component>
 					<Component Id="_sqlite3.pyd" Guid="*">
 			                    <File Id="_sqlite3.pyd" KeyPath="yes" Source="SourceDir\_sqlite3.pyd" />
 			                </Component>
@@ -3400,6 +3403,7 @@
 			<ComponentRef Id="_multiprocessing.pyd" />
 			<ComponentRef Id="_queue.pyd" />
 			<ComponentRef Id="_socket.pyd" />
+			<ComponentRef Id="sqlite3.dll" />
 			<ComponentRef Id="_sqlite3.pyd" />
 			<ComponentRef Id="_ssl.pyd" />
 			<ComponentRef Id="_testcapi.pyd" />
diff --git a/setup.py b/setup.py
index 07d66e32..8d04f3bc 100755
--- a/setup.py
+++ b/setup.py
@@ -134,7 +134,8 @@ elif sys.platform=='win32':
             'stations.p',
             'systems.p',
             '%s.VisualElementsManifest.xml' % APPNAME,
-            '%s.ico' % APPNAME
+            '%s.ico' % APPNAME,
+            '%s/DLLs/sqlite3.dll' % (sys.base_prefix),
         ]),
         ('L10n', [join('L10n',x) for x in os.listdir('L10n') if x.endswith('.strings')]),
         ('plugins', PLUGINS),