From 1db1e6b802d6fa4b853c007713b150bd7b63b57e Mon Sep 17 00:00:00 2001
From: Justin Clift <justin@postgresql.org>
Date: Sun, 12 Apr 2020 18:10:03 +1000
Subject: [PATCH] Attempt #1 to work around WiX error CNDL0014

WiX doesn't seem to like the hyphen character ("-") being used
in Id's, which is a problem as it's used in the OpenSSL library
filenames.
---
 installer/windows/product.wxs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index 0a47fd994..c05bc6885 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -88,8 +88,8 @@
                     <Component><File Source="$(var.QtPath)\bin\Qt5PrintSupport.dll" /></Component>
                     <Component><File Source="$(var.QtPath)\bin\Qt5Widgets.dll" /></Component>
                     <Component><File Source="$(var.QtPath)\bin\Qt5Xml.dll" /></Component>
-                    <Component><File Source="$(var.OpenSSLPath)\libcrypto-1_1.dll" /></Component>
-                    <Component><File Source="$(var.OpenSSLPath)\libssl-1_1.dll" /></Component>
+                    <Component><File Id="libcrypto.dll" Source="$(var.OpenSSLPath)\libcrypto-1_1.dll" /></Component>
+                    <Component><File Id="libssl.dll" Source="$(var.OpenSSLPath)\libssl-1_1.dll" /></Component>
                     <Component><File Source="$(var.SQLCipherPath)\sqlcipher.dll" /></Component>
                     <Component><File Source="$(var.SQLitePath)\sqlite3.dll" /></Component>
                     <Component><File Source="$(var.SQLiteExePath)\DB Browser for SQLite.exe" Checksum="yes" /></Component>
@@ -181,8 +181,8 @@
             <ComponentRef Id="Qt5Widgets.dll" />
             <ComponentRef Id="Qt5Xml.dll" />
             <!-- OpenSSL -->
-            <ComponentRef Id="libcrypto-1_1.dll" />
-            <ComponentRef Id="libssl-1_1.dll" />
+            <ComponentRef Id="libcrypto.dll" />
+            <ComponentRef Id="libssl.dll" />
             <!-- SQLite & SQLCipher -->
             <ComponentRef Id="sqlcipher.dll" />
             <ComponentRef Id="sqlite3.dll" />