From 5bd576de8b0f821acfe7f3580211800fb7dc5f8a Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Sat, 27 Aug 2005 23:19:32 +0000
Subject: [PATCH] Update installer: - Install in configurable directories. -
 Add documentation, with a shortcut from the start menu. - Update the banner
 bitmap.

---
 Makefile.am             |   5 +-
 installer/banner.bmp    | Bin 18038 -> 94554 bytes
 installer/new.bmp       | Bin 0 -> 318 bytes
 installer/psqlodbc.wxs  | 198 ++++++++++++++++++++++++++++++++++++++--
 installer/psqlodbcm.wxs |   2 +-
 installer/up.bmp        | Bin 0 -> 318 bytes
 6 files changed, 192 insertions(+), 13 deletions(-)
 create mode 100644 installer/new.bmp
 create mode 100644 installer/up.bmp

diff --git a/Makefile.am b/Makefile.am
index 9c97ece..46f328d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.21 2005/08/27 22:00:54 dpage Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.22 2005/08/27 23:19:32 dpage Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -41,7 +41,8 @@ EXTRA_DIST = license.txt readme.txt odbcinst.ini \
     docs/howto-debian.html docs/howto-redhat.html \
     docs/howto-vb.html docs/howto-vblo.html \
     docs/unix-compilation.html docs/win32-compilation.html \
-    installer/banner.bmp installer/lgpl.rtf \
+    installer/banner.bmp installer/lgpl.rtf \
+    installer/new.bmp installer/up.bmp \
     installer/Make.bat installer/psqlodbc.wxs \
     installer/psqlodbcm.wxs installer/README.txt
 	
diff --git a/installer/banner.bmp b/installer/banner.bmp
index c99c0d2f4ad12adbc68cb82e4c187b76877ab2d4..484550916c95577e33433cc6bfffa4a8b645912e 100644
GIT binary patch
literal 94554
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

literal 18038
zcmeI2TWDiN7{|X{K%@#M>#m?8d)k7R%93p7)KWxF?Xh`KG%IZs*@rwV?TcuI?gbw-
zPd@Lu?aL~d1ushr5~N7k`fwiHeNYgEE_h+nJg6YP1WeLH49Cy^<ivDam(o)fY$h{w
zk~z~eG{5ivpKoSPI`P8UG_}fEygr8dcZ5iGMJV3tmlsZ7P!06RdJ6URd+w!ok0)vQ
zjo0Y=Pv4`P?iaLi{VM(X?R6^M+@Q+Fk5v8r7xF3<^1KQ)J&%}WWm$W<X#QSSU;AJC
zU;Dq8BcT1?%j)a=ul=w6-^&ru{_kb=b^h1>*Z%MB2xMh>dG<eLruB=RFYOyU$lCv%
zP;_adrLfk2pXznL|8J-NOm=qm&d&ey`;71ZGHi2rU~G?nSV{e#NhA)X@2viN4CleP
zt^dA>guS<qqN4sYiAQD<_xG;;zQ}O@(c9|3RNm3u{rWF`Ad&pVNtb_co@2gLWPkc(
zs*f)f(0v-+y!y&#@|G*-)||Y*jDo&)>3;rHT%xQS^eA7TNRG+ob&8sOY$nl7^f+G=
z!YVR<j5q5$PoQM}#aH0_-++HSVnp3H2k0Tme*)i(2mGmMf3&g!;^*0S@HWP3^83b-
z1<EWgBN*T}V+#SlZw#$dekFaz8R1QlJ}pMUKbg(uRnvcy?4|*~Uygy_H;(y%{~MIS
z&($(7h;mI7ZU_tfTjoa;6q)}u%CUKrd0guM7c7AMhxuQpf-iEwtcl`^<vY)cvYPx=
z%1h+B@gVpc9sU}*fJXuUJopzyQC0o|r|#yLKu)&T;jdCV*{=w9YLtJji-LOmvA0~V
zlH~V{Sa}CO{yWOX((hR8j5627oO=9`#9%(~|DW_UGTJu(3nBS$VBvFcB&>^^di;?1
zNRa<7Lw@i#fh_a?!>#;>i>8AlDEU1V`J=*!tRm|h$qRAz!OvL#4DiRfK{>2{yeLL0
z>hj0=BE4uHo~O*`(Q{+p(2#4!=H>n;GWel6^br*sj`a?!%wHq>1opq>DkbikphI?h
z|JzS<;}J84*^gsUi+@u^|4W-EYX%K*^Ef>)K~cL(vEe6pVAPz$vFItDm!}`b`ln|8
zk8_ifeC1W-zMrziHTd5@^Y&Vi*WA@2e}e9*CxPGQS8)Ar=`RU`BG<d^MP`2Hg%P<8
zbk$q`;*9yfMSN>J=#@Jk=C3R~4iH!Z)jR)O#2VKr19qp`Zk)1QUV`>{o>KAr7acYt
z?iTZx<*jzmx+W&4M<Bd4-Fp6UORTV4+Ie%=U8k`BJG|?sZr~7v$uFP(<P`KjMF$JJ
z^2;ZG*a7_Jh%|FUwfSEvmCC#0Gk-0g|MDO2SMXZec60ape;ZEd3(X%oWJ(Rt`YR=8
zXc(=3=#VKjK<lrRoS|W~{-Hyr)Bvr&QgVid(fWrDnNkC^{z}Oi8s;GCe?BzD{s$aH
L{{7R0A4&fJ+*Aj&

diff --git a/installer/new.bmp b/installer/new.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..27881dfe972209bb5825c15cb7bc00bbde46c7c2
GIT binary patch
literal 318
zcmZQzU<5(|0RaXO&|qX>5ChRb3=&ZQVnzlQAj!bc04A{!KpBu^Lj!~Yl0YWIfddDC
zG)Uq<7%}|+4`Kl^5Q2n21UlFa1RH>Y#L_VR++bZW9?>+&2@U*cm>0<B24Z#~mIC_Y
TIs?PQ)j;>w0`Ys0yAd=1E8#zj

literal 0
HcmV?d00001

diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
index 8754759..2e942b3 100644
--- a/installer/psqlodbc.wxs
+++ b/installer/psqlodbc.wxs
@@ -24,16 +24,50 @@
         
 <!-- Directories -->
 
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="SystemFolder" Name="." SourceName="System32">
-        <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="BASEDIR" Name="psqlODBC">
+          <Directory Id="BINDIR" Name="bin">
+            <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />
+          </Directory>
+          <Directory Id="DOCSDIR" Name="docs">
+            <Component Id="docs" Guid="99F6DEB2-7FC4-497e-8358-C44724681BCA">
+              <File Id="docs.index.html" Name="index.htm" LongName="index.html" DiskId="1" src="../docs/index.html" />
+              <File Id="docs.config.html" Name="config.htm" LongName="config.html" DiskId="1" src="../docs/config.html" />
+              <File Id="docs.faq.html" Name="faq.htm" LongName="faq.html" DiskId="1" src="../docs/faq.html" />
+              <File Id="docs.howto_accesslo.html" Name="howto1.htm" LongName="accesslo.html" DiskId="1" src="../docs/howto-accesslo.html" />
+              <File Id="docs.howto_accessvba.html" Name="howto2.htm" LongName="accessvba.html" DiskId="1" src="../docs/howto-accessvba.html" />
+              <File Id="docs.howto_bo.html" Name="howto3.htm" LongName="howto-bo.html" DiskId="1" src="../docs/howto-bo.html" />
+              <File Id="docs.howto_ch.html" Name="howto4.htm" LongName="howto-ch.html" DiskId="1" src="../docs/howto-ch.html" />
+              <File Id="docs.howto_csharp.html" Name="howto5.htm" LongName="howto-csharp.html" DiskId="1" src="../docs/howto-csharp.html" />
+              <File Id="docs.howto_debian.html" Name="howto6.htm" LongName="howto-debian.html" DiskId="1" src="../docs/howto-debian.html" />
+              <File Id="docs.howto_redhat.html" Name="howto7.htm" LongName="howto-redhat.html" DiskId="1" src="../docs/howto-redhat.html" />
+              <File Id="docs.howto_vb.html" Name="howto8.htm" LongName="howto-vb.html" DiskId="1" src="../docs/howto-vb.html" />
+              <File Id="docs.howto_vblo.html" Name="howto9.htm" LongName="howto-vblo.html" DiskId="1" src="../docs/howto-vblo.html" />
+              <File Id="docs.unix_compilation.html" Name="unix.htm" LongName="unix-compilation.html" DiskId="1" src="../docs/unix-compilation.html" />
+              <File Id="docs.win32_compilation.html" Name="win32.htm" LongName="win32-compilation.html" DiskId="1" src="../docs/win32-compilation.html" />
+             
+              <Shortcut Id="docs.index.html" Directory="SMDIR" Name="docs" LongName="Documentation index" Target="[#docs.index.html]" Description="psqlODBC documentation, HOWTOs and FAQs" Show="normal" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+      <Directory Id="ProgramMenuFolder" Name="." SourceName="Programs">
+        <Directory Id="SMDIR" Name="psqlODBC" LongName="psqlODBC $(var.VERSION)" />
       </Directory>
     </Directory>
         
 <!-- Features -->
 
-	<Feature Id="psqlodbc" Title="psqlODBC" Level="1">
-      <MergeRef Id="psqlodbcm" />
+	<Feature Id="psqlodbc" Title="psqlODBC" Level="1" Description="psqlODBC - The PostgreSQL ODBC Driver" ConfigurableDirectory="BASEDIR" Display="expand">
+      <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries." ConfigurableDirectory="BINDIR">
+        <MergeRef Id="psqlodbcm" />
+      </Feature>
+      
+      <Feature Id="docs" Title="Documentation" Level="1" Description="Documentation, FAQs and HOWTOs." ConfigurableDirectory="DOCSDIR">
+        <ComponentRef Id="docs" />
+      </Feature>
+      
     </Feature>
     <Media Id="1" EmbedCab="yes" Cabinet="psqlodbc.cab"/>
     
@@ -53,7 +87,63 @@
 
 <!-- Bitmaps -->
 
-      <Binary Id="BannerBmp" src="banner.bmp" />
+      <Binary Id="BannerBmp" src="banner.bmp" />
+      <Binary Id="UpBmp" src="up.bmp" />
+      <Binary Id="NewBmp" src="new.bmp" />
+        
+<!-- UI Text -->
+
+      <UIText Id="AbsentPath" />
+      <UIText Id="bytes">bytes</UIText>
+      <UIText Id="GB">GB</UIText>
+      <UIText Id="KB">KB</UIText>
+      <UIText Id="MB">MB</UIText>
+      <UIText Id="MenuAbsent">Entire feature will be unavailable</UIText>
+      <UIText Id="MenuCD">Will be installed to run from CD</UIText>
+      <UIText Id="MenuLocal">Will be installed on local hard drive</UIText>
+      <UIText Id="MenuNetwork">Will be installed to run from network</UIText>
+      <UIText Id="NewFolder">Fldr|New Folder</UIText>
+      <UIText Id="SelAbsentAbsent">This feature will remain uninstalled</UIText>
+      <UIText Id="SelAbsentCD">This feature will be installed to run from CD</UIText>
+      <UIText Id="SelAbsentLocal">This feature will be installed on the local hard drive</UIText>
+      <UIText Id="SelAbsentNetwork">This feature will be installed to run from the network</UIText>
+      <UIText Id="SelCDAbsent">This feature will be uninstalled completely, you won't be able to run it from CD</UIText>
+      <UIText Id="SelCDCD">This feature will remain to be run from CD</UIText>
+      <UIText Id="SelCDLocal">This feature will change from run from CD state to be installed on the local hard drive</UIText>
+      <UIText Id="SelChildCostNeg">This feature frees up [1] on your hard drive.</UIText>
+      <UIText Id="SelChildCostPos">This feature requires [1] on your hard drive.</UIText>
+      <UIText Id="SelLocalAbsent">This feature will be completely removed</UIText>
+      <UIText Id="SelLocalCD">This feature will be removed from your local hard drive, but will be still available to run from CD</UIText>
+      <UIText Id="SelLocalLocal">This feature will remain on your local hard drive</UIText>
+      <UIText Id="SelLocalNetwork">This feature will be removed from your local hard drive, but will be still available to run from the network</UIText>
+      <UIText Id="SelNetworkAbsent">This feature will be uninstalled completely, you won't be able to run it from the network</UIText>
+      <UIText Id="SelNetworkLocal">This feature will change from run from network state to be installed on the local hard drive</UIText>
+      <UIText Id="SelNetworkNetwork">This feature will remain to be run from the network</UIText>
+      <UIText Id="SelParentCostNegNeg">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
+      <UIText Id="SelParentCostNegPos">This feature frees up [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
+      <UIText Id="SelParentCostPosNeg">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures free up [4] on your hard drive.</UIText>
+      <UIText Id="SelParentCostPosPos">This feature requires [1] on your hard drive. It has [2] of [3] subfeatures selected. The subfeatures require [4] on your hard drive.</UIText>
+      <UIText Id="VolumeCostAvailable">Available</UIText>
+      <UIText Id="VolumeCostDifference">Difference</UIText>
+      <UIText Id="VolumeCostRequired">Required</UIText>
+      <UIText Id="VolumeCostSize">Disk Size</UIText>
+      <UIText Id="VolumeCostVolume">Volume</UIText>
+      <UIText Id="TimeRemaining">Time remaining: {[1] minutes }{[2] seconds}</UIText>
+      <UIText Id="SelNetworkAdvertise">This feature will change from run from network state to set to be installed when required</UIText>
+      <UIText Id="SelLocalAdvertise">This feature will be removed from your local hard drive, but will be set to be installed when required</UIText>
+      <UIText Id="SelCostPending">Compiling cost for this feature...</UIText>
+      <UIText Id="SelCDAdvertise">This feature will change from run from CD state to set to be installed when required</UIText>
+      <UIText Id="SelAdvertiseNetwork">This feature will be available to run from the network</UIText>
+      <UIText Id="SelAdvertiseLocal">This feature will be installed on your local hard drive</UIText>
+      <UIText Id="SelAdvertiseCD">This feature will be available to run from CD</UIText>
+      <UIText Id="SelAdvertiseAdvertise">Will be installed when required</UIText>
+      <UIText Id="SelAdvertiseAbsent">This feature will become unavailable</UIText>
+      <UIText Id="SelAbsentAdvertise">This feature will be set to be installed when required</UIText>
+      <UIText Id="MenuAllNetwork">Entire feature will be installed to run from network</UIText>
+      <UIText Id="MenuAllLocal">Entire feature will be installed on local hard drive</UIText>
+      <UIText Id="MenuAllCD">Entire feature will be installed to run from CD</UIText>
+      <UIText Id="ScriptInProgress">Gathering required information...</UIText>
+      <UIText Id="MenuAdvertise">Feature will be installed when required</UIText>
       
 <!-- Cancel dialog -->
 
@@ -133,6 +223,42 @@
         <Control Id="wc_txt3" Type="Text" X="10" Y="200" Width="365" Height="30" Transparent="yes">
           <Text>Click the finish button to exit from the installer.</Text>
         </Control>
+      </Dialog>
+      
+<!-- Browse dialog --> 
+
+      <Dialog Id="Browse" Width="348" Height="193" Title="psqlODBC (libpq) $(var.VERSION)">
+        <Control Id="TailText" Type="Text" X="9" Y="151" Width="55" Height="14" TabSkip="no">
+          <Text>&amp;Folder name:</Text>
+        </Control>
+        <Control Id="Tail" Type="PathEdit" X="65" Y="147" Width="212" Height="18" Property="_BrowseProperty" Indirect="yes">
+          <Text></Text>
+        </Control>
+        <Control Id="OK" Type="PushButton" X="282" Y="148" Width="56" Height="17" Default="yes">
+          <Text>OK</Text>
+          <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
+          <Publish Event="EndDialog" Value="Return">1</Publish>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="282" Y="172" Width="56" Height="17" Cancel="yes">
+          <Text>Cancel</Text>
+          <Publish Event="Reset" Value="0">1</Publish>
+          <Publish Event="EndDialog" Value="Return">NOT BaseBrowse</Publish>
+          <Publish Event="SpawnDialog" Value="Cancel">BaseBrowse</Publish>
+        </Control>
+        <Control Id="ComboText" Type="Text" X="10" Y="13" Width="54" Height="15" TabSkip="no">
+          <Text>&amp;Look in:</Text>
+        </Control>
+        <Control Id="Combo" Type="DirectoryCombo" X="65" Y="10" Width="230" Height="80" Property="_BrowseProperty" Indirect="yes" Removable="yes" Fixed="yes" Remote="yes" CDROM="yes">
+          <Text></Text>
+          <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
+        </Control>
+        <Control Id="Up" Type="PushButton" X="300" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="UpBmp">
+          <Publish Event="DirectoryListUp" Value="0">1</Publish>
+        </Control>
+        <Control Id="NewFolder" Type="PushButton" X="320" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="NewBmp">
+          <Publish Event="DirectoryListNew" Value="0">1</Publish>
+        </Control>
+        <Control Id="List" Type="DirectoryList" X="8" Y="29" Width="330" Height="115" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
       </Dialog>
       
 <!-- Welcome dialog -->
@@ -143,7 +269,7 @@
         <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
         <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
         <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
-    
+     
         <!-- dialog buttons -->
         <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
           <Text>&amp;Next &gt;</Text>
@@ -156,7 +282,7 @@
           <Text>Cancel</Text>
           <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
         </Control>
-    
+      
         <!-- dialog specific controls -->
         <Control Id="wc_txt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
           <Text>{\Arial10Bold}Welcome to the psqlODBC Installation Wizard</Text>
@@ -181,7 +307,7 @@
         <!-- dialog buttons -->
         <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
           <Text>&amp;Next &gt;</Text>
-          <Publish Event="NewDialog" Value="Ready_Dialog">1</Publish>
+          <Publish Event="NewDialog" Value="Selection_Dialog">1</Publish>
         </Control>
         <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
           <Text>&lt; &amp;Back</Text>
@@ -202,6 +328,58 @@
         <Control Id="lgpl_rtf" Type="ScrollableText" X="5" Y="73" Width="365" Height="155" Sunken="yes">
           <Text src="lgpl.rtf" />
         </Control>
+      </Dialog>
+      
+<!-- Feature selection dialog -->
+
+      <Dialog Id="Selection_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes">
+       
+        <!-- common dialog items -->
+        <Control Id="wc_bmp" Type="Bitmap" X="0" Y="-15" Width="375" Height="70" Text="BannerBmp" FixedSize="yes" />
+        <Control Id="wc_l1" Type="Line" X="0" Y="46" Width="378" Height="1" />
+        <Control Id="wc_l2" Type="Line" X="0" Y="234" Width="378" Height="1" />
+            
+        <!-- dialog buttons -->
+        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">
+          <Text>&amp;Next &gt;</Text>
+          <Publish Event="NewDialog" Value="Ready_Dialog">1</Publish>
+        </Control>
+        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
+          <Text>&lt; &amp;Back</Text>
+          <Publish Event="NewDialog" Value="Licence_Dialog">1</Publish>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
+          <Text>Cancel</Text>
+          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>
+        </Control>
+            
+        <!-- dialog specific controls -->
+        <Control Id="ot1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
+          <Text>{\Arial10Bold}Feature selection</Text>
+        </Control>
+        <Control Id="FeatureTree" Type="SelectionTree" X="5" Y="56" Width="205" Height="133" Property="_BrowseProperty" />
+        <Control Id="SelectionFrame" Type="GroupBox" X="216" Y="51" Width="150" Height="135" />
+        <Control Id="ItemDescription" Type="Text" X="221" Y="61" Width="136" Height="80">
+          <Subscribe Event="SelectionDescription" Attribute="Text" />
+        </Control>
+        <Control Id="Size" Type="Text" X="221" Y="135" Width="137" Height="45">
+          <Subscribe Event="SelectionSize" Attribute="Text" />
+        </Control>
+        <Control Id="LocationFrame" Type="GroupBox" X="5" Y="190" Width="360" Height="40" />
+        <Control Id="LocationPath" Type="Text" X="11" Y="213" Width="283" Height="11">
+          <Text>Path</Text>
+          <Subscribe Event="SelectionPath" Attribute="Text" /> 
+        </Control>
+        <Control Id="LocationText" Type="Text" X="11" Y="200" Width="261" Height="11">
+          <Text>Current location:</Text>
+          <Subscribe Event="SelectionPathOn" Attribute="Visible" />
+          <Condition Action="hide">Installed</Condition>
+        </Control>
+            
+        <Control Id="PushButton44" Type="PushButton" X="300" Y="209" Width="56" Height="17" TabSkip="yes">
+          <Text>B&amp;rowse</Text>
+          <Publish Event="SelectionBrowse" Value="Browse">1</Publish>
+        </Control>
       </Dialog>
   
 <!-- Ready dialogue -->
@@ -221,7 +399,7 @@
         </Control>
         <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">
           <Text>&lt; &amp;Back</Text>
-          <Publish Event="NewDialog" Value="Licence_Dialog">1</Publish>
+          <Publish Event="NewDialog" Value="Selection_Dialog">1</Publish>
         </Control>
         <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">
           <Text>Cancel</Text>
diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index c09129e..9e29cce 100644
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -18,7 +18,7 @@
       SummaryCodepage="1252" />
     
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="SystemFolder" Name="Redist">
+      <Directory Id="BINDIR" Name=".">
         <Component Id="psqlodbc.files" Guid="F66FBDE8-2E5C-4759-A8DC-85052DAA1374">
         
           <!-- PostgreSQL -->
diff --git a/installer/up.bmp b/installer/up.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..86f6b5a84755483dee8175ebc821d3af0ce866b8
GIT binary patch
literal 318
zcma)&F%Ez*3<F(>jinPaBfq3iVrS`7_(?ej5C}1lG<M>oRa7bAIcM3XBn@W5%19)2
zpi~0CfR3A`90Zc8)(X4P;;1!e1a8Ujwl!?g%}lJWd!z?T2-Gq9(9iqVy9{0F7kh<5
P<5%!Eb(Xf+-TO;BySGdd

literal 0
HcmV?d00001

-- 
2.39.5