Update the installer for WiX 3

diff --git a/installer/Make.bat b/installer/Make.bat
index 0a01947724a0be82736f0d62564c423f9b63aad3..297b11fe04ad6b740a542f98ba91f9cb102f0a83 100644 (file)
--- a/installer/Make.bat
+++ b/installer/Make.bat
@@ -32,7 +32,7 @@ echo Building psqlODBC installer database...
 candle -nologo -dVERSION=%VERSION% -dSUBLOC=%SUBLOC% -dPROGRAMFILES="%ProgramFiles%" psqlodbc.wxs
 IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
-light -nologo psqlodbc.wixobj
+light -nologo -ext WixUIExtension -cultures:en-us psqlodbc.wixobj
 IF ERRORLEVEL 1 GOTO ERR_HANDLER
 
 echo.

diff --git a/installer/README.txt b/installer/README.txt
index de39ac605680625c861fdf34bfe17268785cb8fd..1f1544d75c5d1b1ce3abd24fd5329dc5424e7847 100644 (file)
--- a/installer/README.txt
+++ b/installer/README.txt
@@ -1,6 +1,6 @@
 This directory contains the psqlODBC installer for Windows. To build the
 installer, you will need a copy of WiX installed somewhere in your system
-path. The installer has been tested with WiX version 2.0.2419 only at the
+path. The installer has been tested with WiX version 3.0.2420 only at the
 time writing. WiX may be downloaded from:
 
   http://sourceforge.net/projects/wix/.

diff --git a/installer/background.bmp b/installer/background.bmp
new file mode 100644 (file)
index 0000000..d65ddea
Binary files /dev/null and b/installer/background.bmp differ

diff --git a/installer/banner.bmp b/installer/banner.bmp
index 484550916c95577e33433cc6bfffa4a8b645912e..ffcecb16df1362d40218a9920ddffbf2c1217eda 100644 (file)
Binary files a/installer/banner.bmp and b/installer/banner.bmp differ

diff --git a/installer/new.bmp b/installer/new.bmp
deleted file mode 100644 (file)
index 27881df..0000000
Binary files a/installer/new.bmp and /dev/null differ

diff --git a/installer/psqlodbc.wxs b/installer/psqlodbc.wxs
index 6c4a67d89b69d1c2dc070fb61789c5d254131144..f0bb4433a42a54532eefa11dc2c298046c44b563 100644 (file)
--- a/installer/psqlodbc.wxs
+++ b/installer/psqlodbc.wxs
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   
 <!-- Product details -->
 
   <Product 
     Manufacturer="PostgreSQL Global Development Group" 
     Id="838E187D-8B7A-473d-B93C-C8E970B15D2B"
+    UpgradeCode="24BCA538-75A2-4a7f-B236-C99EFC2145DE"
     Name="psqlODBC"
     Version="$(var.VERSION)" 
     Language="1033">
-      
+
 <!-- Package details -->
 
-   <Package 
-      Id="E545FBC2-C8B1-4a1b-B73F-62EF3909E470"
+    <Package
       Keywords="PostgreSQL, ODBC"
       Comments="PostgreSQL ODBC Driver"
       Manufacturer="PostgreSQL Global Development Group" 
-      InstallerVersion="110" 
+      InstallerVersion="150"
       Languages="1033" 
       Compressed="yes" 
       SummaryCodepage="1252" />
@@ -30,34 +30,39 @@
           <Directory Id="SUBLOC" Name="$(var.SUBLOC)">
             <Directory Id="BINDIR" Name="bin">
               <Component Id="registration" Guid="4F0C04EB-ADCB-4fa8-B6A3-E9F74EA693F8">
-                <Registry KeyPath="yes" Type="string" Root="HKCU" Key="Software\psqlODBC\Version" Value="$(var.VERSION)" />
+                <RegistryValue KeyPath="yes" Type="string" Root="HKLM" Key="Software\psqlODBC\Version" Value="$(var.VERSION)" />
               </Component>
-              <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />
+              <Merge Id="psqlodbcm" DiskId="1" Language="1033" SourceFile="psqlodbc.msm" />
             </Directory>
             <Directory Id="DOCSDIR" Name="docs">
               <Component Id="docs" Guid="89DDBC52-9F0D-4846-91DC-09EECC87E42E">
-                <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="howto-accesslo.html" DiskId="1" src="../docs/howto-accesslo.html" />
-                <File Id="docs.howto_accessvba.html" Name="howto2.htm" LongName="howto-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_vb.html" Name="howto6.htm" LongName="howto-vb.html" DiskId="1" src="../docs/howto-vb.html" />
-                <File Id="docs.howto_vblo.html" Name="howto7.htm" LongName="howto-vblo.html" DiskId="1" src="../docs/howto-vblo.html" />
-                <File Id="docs.release.html" Name="release.htm" LongName="release.html" DiskId="1" src="../docs/release.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" />
+                <File Id="docs.index.html" Name="index.html" DiskId="1" Source="../docs/index.html" KeyPath="yes" />
+                <File Id="docs.config.html" Name="config.html" DiskId="1" Source="../docs/config.html" />
+                <File Id="docs.faq.html" Name="faq.html" DiskId="1" Source="../docs/faq.html" />
+                <File Id="docs.howto_accesslo.html" Name="howto-accesslo.html" DiskId="1" Source="../docs/howto-accesslo.html" />
+                <File Id="docs.howto_accessvba.html" Name="howto-accessvba.html" DiskId="1" Source="../docs/howto-accessvba.html" />
+                <File Id="docs.howto_bo.html" Name="howto-bo.html" DiskId="1" Source="../docs/howto-bo.html" />
+                <File Id="docs.howto_ch.html" Name="howto-ch.html" DiskId="1" Source="../docs/howto-ch.html" />
+                <File Id="docs.howto_csharp.html" Name="howto-csharp.html" DiskId="1" Source="../docs/howto-csharp.html" />
+                <File Id="docs.howto_vb.html" Name="howto-vb.html" DiskId="1" Source="../docs/howto-vb.html" />
+                <File Id="docs.howto_vblo.html" Name="howto-vblo.html" DiskId="1" Source="../docs/howto-vblo.html" />
+                <File Id="docs.release.html" Name="release.html" DiskId="1" Source="../docs/release.html" />
+                <File Id="docs.unix_compilation.html" Name="unix-compilation.html" DiskId="1" Source="../docs/unix-compilation.html" />
+                <File Id="docs.win32_compilation.html" Name="win32-compilation.html" DiskId="1" Source="../docs/win32-compilation.html" />
+
+                <Shortcut Id="docs.index.html" Directory="SMDir" Name="Documentation index" Description="psqlODBC documentation, HOWTOs and FAQs" Advertise="yes" Show="normal" />
               </Component>
             </Directory>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder" Name="." SourceName="Programs">
-        <Directory Id="SMDIR" Name="psqlODBC" />
+        <Directory Id="SMDir" Name="psqlODBC">
+            <Component Id="smdir" Guid="{22288E09-B3B6-4181-907F-676099C20125}">
+                <RegistryValue KeyPath="yes" Type="string" Root="HKCU" Key="Software\psqlODBC\SMDir Created" Value="y" />
+                <RemoveFolder Id="SMDir" On="uninstall" />
+            </Component>
+        </Directory>
       </Directory>
     </Directory>
 
@@ -68,402 +73,26 @@
         <ComponentRef Id="registration" />
         <MergeRef Id="psqlodbcm" />
       </Feature>
-      
+
       <Feature Id="docs" Title="Documentation" Level="4" Description="Documentation, FAQs and HOWTOs.">
+        <ComponentRef Id="smdir" />
         <ComponentRef Id="docs" />
       </Feature>
-      
+
     </Feature>
     <Media Id="1" EmbedCab="yes" Cabinet="psqlodbc.cab"/>
-    
+
 <!-- Properties -->
 
-    <Property Id="UILANG" Value="1033"/>
-    <Property Id="_Title">{\Arial8Bold}</Property>
-    <Property Id="DefaultUIFont">MSSansSerif8</Property>
     <Property Id="ALLUSERS">2</Property>
-    
-<!-- UI -->
-
-    <UI>
-      <TextStyle Id="Arial8Bold" FaceName="Arial" Size="8" Bold="yes" />
-      <TextStyle Id="Arial14" FaceName="Arial" Size="14" />
-      <TextStyle Id="MSSansSerif8" FaceName="MS Sans Serif" Size="8" />
-
-<!-- Bitmaps -->
-
-      <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 -->
-
-      <Dialog Id="Cancel" Width="233" Height="127" Title="psqlODBC $(var.VERSION)" NoMinimize="yes">
-        <Control Id="No" Type="PushButton" X="101" Y="101" Width="56" Height="17" Default="yes">
-          <Text>&amp;Resume</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="Yes" Type="PushButton" X="164" Y="101" Width="56" Height="17" Cancel="yes">
-          <Text>&amp;Exit Setup</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="210" Height="59">
-          <Text>Installation is not complete.  If you quit the setup program now, the application will not be installed. You can run the setup program at a later time to complete the installation.</Text>
-        </Control>
-        <Control Id="Text2515" Type="Text" X="10" Y="68" Width="210" Height="30">
-          <Text>To continue installing, click Resume.  To quit the setup program, click Exit Setup.</Text>
-        </Control>
-      </Dialog>
-
-<!-- Fatal Error dialog -->
-
-      <Dialog Id="Fatal_Error" X="40" Y="40" Width="240" Height="81" Title="Fatal Error">
-        <Control Id="OK" Type="PushButton" X="172" Y="56" Width="56" Height="17" Default="yes">
-          <Text>OK</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="220" Height="37">
-          <Text>Installation ended prematurely because of an error.</Text>
-        </Control>
-      </Dialog>
+    <Property Id="WIXUI_INSTALLDIR" Value="BASEDIR" />
 
-<!-- User Exit dialog -->
-
-      <Dialog Id="User_Exit" Width="240" Height="81" Title="psqlODBC Setup Cancelled">
-        <Control Id="OK" Type="PushButton" X="172" Y="56" Width="56" Height="17" Default="yes">
-          <Text>OK</Text>
-          <Publish Event="EndDialog" Value="Exit">1</Publish>
-        </Control>
-        <Control Id="Text" Type="Text" X="10" Y="9" Width="220" Height="44">
-          <Text>psqlODBC Setup was interrupted before it was fully installed.</Text>
-        </Control>
-      </Dialog>
-
-<!-- Exit dialog -->
-
-      <Dialog Id="Exit_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)">
-        
-        <!-- 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="OK" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes" Cancel="yes">
-          <Text>&amp;Finish</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-        </Control>
-        <Control Id="PushButton" Type="PushButton" X="189" Y="244" Width="56" Height="17">
-          <Text>&lt; &amp;Back</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-          <Condition Action="disable">1</Condition>
-        </Control>
-        <Control Id="PushButton1" Type="PushButton" X="309" Y="244" Width="56" Height="17">
-          <Text>Cancel</Text>
-          <Publish Event="EndDialog" Value="Return">1</Publish>
-          <Condition Action="disable">1</Condition>
-        </Control>
-      
-        <!-- dialog specific controls -->
-        <Control Id="uit1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Installation complete!</Text>
-        </Control>
-        <Control Id="ui2" Type="Text" X="10" Y="75" Width="365" Height="30" Transparent="yes">
-          <Text>Congratulations, psqlODBC $(var.VERSION) has been successfully installed on your system.</Text>
-        </Control>  
-        <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 $(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 -->
-
-      <Dialog Id="Welcome_Dialog" Width="375" Height="270" Title="psqlODBC $(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="Licence_Dialog">1</Publish>
-        </Control>
-        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17" Disabled="yes">
-          <Text>&lt; &amp;Back</Text>
-        </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="wc_txt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Welcome to the psqlODBC Installation Wizard</Text>
-        </Control>
-        <Control Id="wc_txt2" Type="Text" X="10" Y="75" Width="365" Height="30" Transparent="yes">
-          <Text>It is strongly recommended that you exit all Windows programs before continuing with this installation.</Text>
-        </Control>
-        <Control Id="wc_txt3" Type="Text" X="12" Y="100" Width="365" Height="30" Transparent="yes">
-          <Text>Click the 'Next' button to continue, or 'Cancel' if you wish to abort the installation and try again later.</Text>
-        </Control>
-      </Dialog>
-      
-<!-- Licence Dialogue -->
-
-      <Dialog Id="Licence_Dialog" Width="375" Height="270" Title="psqlODBC $(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="Selection_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="Welcome_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="wt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-           <Text>{\Arial10Bold}Licence</Text>
-        </Control>
-        <Control Id="wt2" Type="Text" X="5" Y="55" Width="365" Height="15">
-          <Text>Please read the psqlODBC licence completely before you continue.</Text>
-        </Control>
-        <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 $(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 -->
-
-      <Dialog Id="Ready_Dialog" Width="375" Height="270" Title="psqlODBC $(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="Remove" Value="ALL">MaintenanceType = "Remove"</Publish>
-          <Publish Event="EndDialog" Value="Return">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="Selection_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="re_txt1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Ready to install</Text>
-        </Control>
-        <Control Id="re_txt2" Type="Text" X="5" Y="80" Width="365" Height="30">
-          <Text>psqlODBC is now ready to be installed. Click Next to complete the installation.</Text>
-        </Control>
-      </Dialog>
-  
-<!-- Progress Dialogue -->
-
-      <Dialog Id="Progress_Dialog" Width="375" Height="270" Title="psqlODBC $(var.VERSION)" CustomPalette="yes" Modeless="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 specific controls -->
-        <Control Id="ct1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">
-          <Text>{\Arial10Bold}Installing...</Text>
-        </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>
-        <Control Id="progtxt" Type="Text" X="15" Y="100" Width="340" Height="15">
-          <Subscribe Event="ActionText" Attribute="Text" />
-        </Control>
-        <Control Id="progdata" Type="Text" X="15" Y="75" Width="340" Height="15">
-          <Text>Initializing...</Text>
-          <Subscribe Event="ActionData" Attribute="Text" />
-        </Control>
-        <Control Id="progress" Type="ProgressBar" X="15" Y="130" Width="340" Height="20" ProgressBlocks="yes" Text="Install progress">
-          <Subscribe Event="SetProgress" Attribute="Progress" />
-        </Control>
-      </Dialog>
-  
-<!-- UI Sequence -->
+<!-- UI -->
 
-      <InstallUISequence>
-      
-        <Show Dialog="Fatal_Error" OnExit="error" />
-        <Show Dialog="User_Exit" OnExit="cancel" />
-        <Show Dialog="Exit_Dialog" OnExit="success" />
+     <UIRef Id="WixUI_FeatureTree" />
+     <WixVariable Id="WixUILicenseRtf" Value="lgpl.rtf" />
+     <WixVariable Id="WixUIDialogBmp" Value="background.bmp" />
+     <WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
 
-        <LaunchConditions After="AppSearch" />
-    
-        <Show Dialog="Welcome_Dialog" After="MigrateFeatureStates">NOT Installed</Show>
-        <Show Dialog="Progress_Dialog" After="Welcome_Dialog" />
-        
-      </InstallUISequence>
-      
-    </UI>   
   </Product>
 </Wix>

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index acc88e74379e8e4a417d4d47948432e5d65368e1..c1edb47077b0c8466d5dd974f55db0ada3564f5a 100644 (file)
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
-  <Module 
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Module
     Id="psqlODBC"
-    Guid="9AB9B79A-3B5B-4ced-8A2D-69B95E809794"
     Version="$(var.VERSION)"
     Language="1033">
     
     <Package 
       Id="ACF10866-5C01-46f0-90F0-D5618638CA48"
       Description="PostgreSQL ODBC Driver"
-      Keywords="PostgreSQL, ODBC" 
+      Keywords="PostgreSQL, ODBC"
       Manufacturer="PostgreSQL Global Development Group" 
-      InstallerVersion="110" 
+      InstallerVersion="150"
       Platforms="Intel" 
       Languages="1033"
-      Compressed="yes" 
       SummaryCodepage="1252" />
 
     <Directory Id="TARGETDIR" Name="SourceDir">
@@ -22,47 +20,47 @@
         <Component Id="psqlodbc.files" Guid="00A1ACE3-B7C2-41b8-A1F1-DB565990DA4E">
 
           <!-- PostgreSQL -->
-          <File Id="psqlodbc30a.dll" LongName="psqlodbc30a.dll" Name="psqlodxA.dll" src="../MultibyteRelease/psqlodbc30a.dll" />
-          <File Id="psqlodbc35w.dll" LongName="psqlodbc35w.dll" Name="psqlodxW.dll" src="../Release/psqlodbc35w.dll" />
-          <File Id="pgxalib.dll" LongName="pgxalib.dll" Name="pgxalib.dll" src="../Release/pgxalib.dll" />
-          <File Id="libpq.dll" Name="libpq.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libpq.dll" KeyPath="yes" />
+          <File Id="psqlodbc30a.dll" Name="psqlodbc30a.dll" Source="../MultibyteRelease/psqlodbc30a.dll" />
+          <File Id="psqlodbc35w.dll" Name="psqlodbc35w.dll" Source="../Release/psqlodbc35w.dll" />
+          <File Id="pgxalib.dll" Name="pgxalib.dll" Source="../Release/pgxalib.dll" />
+          <File Id="libpq.dll" Name="libpq.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libpq.dll" KeyPath="yes" />
           
           <!-- Gettext -->
-          <File Id="libintl_2.dll" LongName="libintl-2.dll" Name="libintXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libintl-2.dll" />
-          <File Id="libiconv_2.dll" LongName="libiconv-2.dll" Name="libicoXX.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libiconv-2.dll" />
+          <File Id="libintl_2.dll" Name="libintl-2.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libintl-2.dll" />
+          <File Id="libiconv_2.dll" Name="libiconv-2.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libiconv-2.dll" />
           
           <!-- SSL -->
-          <File Id="libeay32.dll" Name="libeay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libeay32.dll" />
-          <File Id="ssleay32.dll" Name="ssleay32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\ssleay32.dll" />
- 
+          <File Id="libeay32.dll" Name="libeay32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\libeay32.dll" />
+          <File Id="ssleay32.dll" Name="ssleay32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\ssleay32.dll" />
+
           <!-- MIT Kerberos -->
-          <File Id="comerr32.dll" Name="comerr32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\comerr32.dll" />
-          <File Id="krb5_32.dll" Name="krb5_32.dll" src="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\krb5_32.dll" />
-          
+          <File Id="comerr32.dll" Name="comerr32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\comerr32.dll" />
+          <File Id="krb5_32.dll" Name="krb5_32.dll" Source="$(var.PROGRAMFILES)\PostgreSQL\8.2\bin\krb5_32.dll" />
+
           <!-- Note, installing the driver properly (IE, using ODBCDriver) has proven unreliable -->
           <!--       so we install the registry keys manually ourselves.                         -->
-          <Registry Id="psqlodbc30a.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL ANSI" Type="string" Value="Installed" />
-          <Registry Id="psqlodbc30a.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="APILevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc30a.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="ConnectFunctions" Type="string" Value="YYN" />
-          <Registry Id="psqlodbc30a.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Driver" Type="string" Value="[#psqlodbc30a.dll]" />
-          <Registry Id="psqlodbc30a.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="DriverODBCVer" Type="string" Value="03.00" />
-          <Registry Id="psqlodbc30a.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="FileUsage" Type="string" Value="0" />
-          <Registry Id="psqlodbc30a.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Setup" Type="string" Value="[#psqlodbc30a.dll]" />
-          <Registry Id="psqlodbc30a.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="SQLLevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc30a.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="UsageCount" Type="integer" Value="1" />
+          <RegistryValue Id="psqlodbc30a.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL ANSI" Type="string" Value="Installed" />
+          <RegistryValue Id="psqlodbc30a.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="APILevel" Type="string" Value="1" />
+          <RegistryValue Id="psqlodbc30a.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="ConnectFunctions" Type="string" Value="YYN" />
+          <RegistryValue Id="psqlodbc30a.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Driver" Type="string" Value="[#psqlodbc30a.dll]" />
+          <RegistryValue Id="psqlodbc30a.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="DriverODBCVer" Type="string" Value="03.00" />
+          <RegistryValue Id="psqlodbc30a.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="FileUsage" Type="string" Value="0" />
+          <RegistryValue Id="psqlodbc30a.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="Setup" Type="string" Value="[#psqlodbc30a.dll]" />
+          <RegistryValue Id="psqlodbc30a.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="SQLLevel" Type="string" Value="1" />
+          <RegistryValue Id="psqlodbc30a.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL ANSI" Name="UsageCount" Type="integer" Value="1" />
 
-          <Registry Id="psqlodbc35w.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL Unicode" Type="string" Value="Installed" />
-          <Registry Id="psqlodbc35w.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="APILevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc35w.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="ConnectFunctions" Type="string" Value="YYN" />
-          <Registry Id="psqlodbc35w.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Driver" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbc35w.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="DriverODBCVer" Type="string" Value="03.51" />
-          <Registry Id="psqlodbc35w.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="FileUsage" Type="string" Value="0" />
-          <Registry Id="psqlodbc35w.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Setup" Type="string" Value="[#psqlodbc35w.dll]" />
-          <Registry Id="psqlodbc35w.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="SQLLevel" Type="string" Value="1" />
-          <Registry Id="psqlodbc35w.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="UsageCount" Type="integer" Value="1" />
+          <RegistryValue Id="psqlodbc35w.reg.1" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" Name="PostgreSQL Unicode" Type="string" Value="Installed" />
+          <RegistryValue Id="psqlodbc35w.reg.2" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="APILevel" Type="string" Value="1" />
+          <RegistryValue Id="psqlodbc35w.reg.3" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="ConnectFunctions" Type="string" Value="YYN" />
+          <RegistryValue Id="psqlodbc35w.reg.4" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Driver" Type="string" Value="[#psqlodbc35w.dll]" />
+          <RegistryValue Id="psqlodbc35w.reg.5" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="DriverODBCVer" Type="string" Value="03.51" />
+          <RegistryValue Id="psqlodbc35w.reg.6" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="FileUsage" Type="string" Value="0" />
+          <RegistryValue Id="psqlodbc35w.reg.7" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="Setup" Type="string" Value="[#psqlodbc35w.dll]" />
+          <RegistryValue Id="psqlodbc35w.reg.8" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="SQLLevel" Type="string" Value="1" />
+          <RegistryValue Id="psqlodbc35w.reg.9" Root="HKLM" Key="SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode" Name="UsageCount" Type="integer" Value="1" />
         </Component>
       </Directory>
     </Directory>
-     
+
   </Module>
 </Wix>
\ No newline at end of file

diff --git a/installer/up.bmp b/installer/up.bmp
deleted file mode 100644 (file)
index 86f6b5a..0000000
Binary files a/installer/up.bmp and /dev/null differ