Update installer:
authorDave Page <dpage@pgadmin.org>
Sat, 27 Aug 2005 23:19:32 +0000 (23:19 +0000)
committerDave Page <dpage@pgadmin.org>
Sat, 27 Aug 2005 23:19:32 +0000 (23:19 +0000)
- Install in configurable directories.
- Add documentation, with a shortcut from the start menu.
- Update the banner bitmap.

Makefile.am
installer/banner.bmp
installer/new.bmp [new file with mode: 0644]
installer/psqlodbc.wxs
installer/psqlodbcm.wxs
installer/up.bmp [new file with mode: 0644]

index 9c97ece0edc660d1d2ccf2abde22f17effd36431..46f328ddb96e539b1e78a3b2bad68258b382f6d8 100644 (file)
@@ -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 \\r
     docs/howto-vb.html docs/howto-vblo.html \\r
     docs/unix-compilation.html docs/win32-compilation.html \
-    installer/banner.bmp installer/lgpl.rtf \
+    installer/banner.bmp installer/lgpl.rtf \\r
+    installer/new.bmp installer/up.bmp \
     installer/Make.bat installer/psqlodbc.wxs \
     installer/psqlodbcm.wxs installer/README.txt
    
index c99c0d2f4ad12adbc68cb82e4c187b76877ab2d4..484550916c95577e33433cc6bfffa4a8b645912e 100644 (file)
Binary files a/installer/banner.bmp and b/installer/banner.bmp differ
diff --git a/installer/new.bmp b/installer/new.bmp
new file mode 100644 (file)
index 0000000..27881df
Binary files /dev/null and b/installer/new.bmp differ
index 875475985c296d4f7bd669ffbd197259cab56186..2e942b31d4312669cf8f6d4e98d9d85f1f2771bd 100644 (file)
         
 <!-- 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">\r
+      <Directory Id="ProgramFilesFolder" Name="PFiles">\r
+        <Directory Id="BASEDIR" Name="psqlODBC">\r
+          <Directory Id="BINDIR" Name="bin">
+            <Merge Id="psqlodbcm" DiskId="1" Language="1033" src="psqlodbc.msm" />\r
+          </Directory>\r
+          <Directory Id="DOCSDIR" Name="docs">\r
+            <Component Id="docs" Guid="99F6DEB2-7FC4-497e-8358-C44724681BCA">\r
+              <File Id="docs.index.html" Name="index.htm" LongName="index.html" DiskId="1" src="../docs/index.html" />\r
+              <File Id="docs.config.html" Name="config.htm" LongName="config.html" DiskId="1" src="../docs/config.html" />\r
+              <File Id="docs.faq.html" Name="faq.htm" LongName="faq.html" DiskId="1" src="../docs/faq.html" />\r
+              <File Id="docs.howto_accesslo.html" Name="howto1.htm" LongName="accesslo.html" DiskId="1" src="../docs/howto-accesslo.html" />\r
+              <File Id="docs.howto_accessvba.html" Name="howto2.htm" LongName="accessvba.html" DiskId="1" src="../docs/howto-accessvba.html" />\r
+              <File Id="docs.howto_bo.html" Name="howto3.htm" LongName="howto-bo.html" DiskId="1" src="../docs/howto-bo.html" />\r
+              <File Id="docs.howto_ch.html" Name="howto4.htm" LongName="howto-ch.html" DiskId="1" src="../docs/howto-ch.html" />\r
+              <File Id="docs.howto_csharp.html" Name="howto5.htm" LongName="howto-csharp.html" DiskId="1" src="../docs/howto-csharp.html" />\r
+              <File Id="docs.howto_debian.html" Name="howto6.htm" LongName="howto-debian.html" DiskId="1" src="../docs/howto-debian.html" />\r
+              <File Id="docs.howto_redhat.html" Name="howto7.htm" LongName="howto-redhat.html" DiskId="1" src="../docs/howto-redhat.html" />\r
+              <File Id="docs.howto_vb.html" Name="howto8.htm" LongName="howto-vb.html" DiskId="1" src="../docs/howto-vb.html" />\r
+              <File Id="docs.howto_vblo.html" Name="howto9.htm" LongName="howto-vblo.html" DiskId="1" src="../docs/howto-vblo.html" />\r
+              <File Id="docs.unix_compilation.html" Name="unix.htm" LongName="unix-compilation.html" DiskId="1" src="../docs/unix-compilation.html" />\r
+              <File Id="docs.win32_compilation.html" Name="win32.htm" LongName="win32-compilation.html" DiskId="1" src="../docs/win32-compilation.html" />\r
+             \r
+              <Shortcut Id="docs.index.html" Directory="SMDIR" Name="docs" LongName="Documentation index" Target="[#docs.index.html]" Description="psqlODBC documentation, HOWTOs and FAQs" Show="normal" />\r
+            </Component>\r
+          </Directory>\r
+        </Directory>
+      </Directory>\r
+      <Directory Id="ProgramMenuFolder" Name="." SourceName="Programs">\r
+        <Directory Id="SMDIR" Name="psqlODBC" LongName="psqlODBC $(var.VERSION)" />\r
       </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">\r
+      <Feature Id="binaries" Title="ODBC Driver" Level="1" Description="The ODBC driver and supporting libraries." ConfigurableDirectory="BINDIR">
+        <MergeRef Id="psqlodbcm" />\r
+      </Feature>\r
+      \r
+      <Feature Id="docs" Title="Documentation" Level="1" Description="Documentation, FAQs and HOWTOs." ConfigurableDirectory="DOCSDIR">
+        <ComponentRef Id="docs" />
+      </Feature>\r
+      
     </Feature>
     <Media Id="1" EmbedCab="yes" Cabinet="psqlodbc.cab"/>
     
 
 <!-- Bitmaps -->
 
-      <Binary Id="BannerBmp" src="banner.bmp" />
+      <Binary Id="BannerBmp" src="banner.bmp" />\r
+      <Binary Id="UpBmp" src="up.bmp" />\r
+      <Binary Id="NewBmp" src="new.bmp" />\r
+        \r
+<!-- UI Text -->\r
+\r
+      <UIText Id="AbsentPath" />\r
+      <UIText Id="bytes">bytes</UIText>\r
+      <UIText Id="GB">GB</UIText>\r
+      <UIText Id="KB">KB</UIText>\r
+      <UIText Id="MB">MB</UIText>\r
+      <UIText Id="MenuAbsent">Entire feature will be unavailable</UIText>\r
+      <UIText Id="MenuCD">Will be installed to run from CD</UIText>\r
+      <UIText Id="MenuLocal">Will be installed on local hard drive</UIText>\r
+      <UIText Id="MenuNetwork">Will be installed to run from network</UIText>\r
+      <UIText Id="NewFolder">Fldr|New Folder</UIText>\r
+      <UIText Id="SelAbsentAbsent">This feature will remain uninstalled</UIText>\r
+      <UIText Id="SelAbsentCD">This feature will be installed to run from CD</UIText>\r
+      <UIText Id="SelAbsentLocal">This feature will be installed on the local hard drive</UIText>\r
+      <UIText Id="SelAbsentNetwork">This feature will be installed to run from the network</UIText>\r
+      <UIText Id="SelCDAbsent">This feature will be uninstalled completely, you won't be able to run it from CD</UIText>\r
+      <UIText Id="SelCDCD">This feature will remain to be run from CD</UIText>\r
+      <UIText Id="SelCDLocal">This feature will change from run from CD state to be installed on the local hard drive</UIText>\r
+      <UIText Id="SelChildCostNeg">This feature frees up [1] on your hard drive.</UIText>\r
+      <UIText Id="SelChildCostPos">This feature requires [1] on your hard drive.</UIText>\r
+      <UIText Id="SelLocalAbsent">This feature will be completely removed</UIText>\r
+      <UIText Id="SelLocalCD">This feature will be removed from your local hard drive, but will be still available to run from CD</UIText>\r
+      <UIText Id="SelLocalLocal">This feature will remain on your local hard drive</UIText>\r
+      <UIText Id="SelLocalNetwork">This feature will be removed from your local hard drive, but will be still available to run from the network</UIText>\r
+      <UIText Id="SelNetworkAbsent">This feature will be uninstalled completely, you won't be able to run it from the network</UIText>\r
+      <UIText Id="SelNetworkLocal">This feature will change from run from network state to be installed on the local hard drive</UIText>\r
+      <UIText Id="SelNetworkNetwork">This feature will remain to be run from the network</UIText>\r
+      <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>\r
+      <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>\r
+      <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>\r
+      <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>\r
+      <UIText Id="VolumeCostAvailable">Available</UIText>\r
+      <UIText Id="VolumeCostDifference">Difference</UIText>\r
+      <UIText Id="VolumeCostRequired">Required</UIText>\r
+      <UIText Id="VolumeCostSize">Disk Size</UIText>\r
+      <UIText Id="VolumeCostVolume">Volume</UIText>\r
+      <UIText Id="TimeRemaining">Time remaining: {[1] minutes }{[2] seconds}</UIText>\r
+      <UIText Id="SelNetworkAdvertise">This feature will change from run from network state to set to be installed when required</UIText>\r
+      <UIText Id="SelLocalAdvertise">This feature will be removed from your local hard drive, but will be set to be installed when required</UIText>\r
+      <UIText Id="SelCostPending">Compiling cost for this feature...</UIText>\r
+      <UIText Id="SelCDAdvertise">This feature will change from run from CD state to set to be installed when required</UIText>\r
+      <UIText Id="SelAdvertiseNetwork">This feature will be available to run from the network</UIText>\r
+      <UIText Id="SelAdvertiseLocal">This feature will be installed on your local hard drive</UIText>\r
+      <UIText Id="SelAdvertiseCD">This feature will be available to run from CD</UIText>\r
+      <UIText Id="SelAdvertiseAdvertise">Will be installed when required</UIText>\r
+      <UIText Id="SelAdvertiseAbsent">This feature will become unavailable</UIText>\r
+      <UIText Id="SelAbsentAdvertise">This feature will be set to be installed when required</UIText>\r
+      <UIText Id="MenuAllNetwork">Entire feature will be installed to run from network</UIText>\r
+      <UIText Id="MenuAllLocal">Entire feature will be installed on local hard drive</UIText>\r
+      <UIText Id="MenuAllCD">Entire feature will be installed to run from CD</UIText>\r
+      <UIText Id="ScriptInProgress">Gathering required information...</UIText>\r
+      <UIText Id="MenuAdvertise">Feature will be installed when required</UIText>
       
 <!-- Cancel dialog -->
 
         <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>\r
+      \r
+<!-- Browse dialog --> \r
+\r
+      <Dialog Id="Browse" Width="348" Height="193" Title="psqlODBC (libpq) $(var.VERSION)">\r
+        <Control Id="TailText" Type="Text" X="9" Y="151" Width="55" Height="14" TabSkip="no">\r
+          <Text>&amp;Folder name:</Text>\r
+        </Control>\r
+        <Control Id="Tail" Type="PathEdit" X="65" Y="147" Width="212" Height="18" Property="_BrowseProperty" Indirect="yes">\r
+          <Text></Text>\r
+        </Control>\r
+        <Control Id="OK" Type="PushButton" X="282" Y="148" Width="56" Height="17" Default="yes">\r
+          <Text>OK</Text>\r
+          <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>\r
+          <Publish Event="EndDialog" Value="Return">1</Publish>\r
+        </Control>\r
+        <Control Id="Cancel" Type="PushButton" X="282" Y="172" Width="56" Height="17" Cancel="yes">\r
+          <Text>Cancel</Text>\r
+          <Publish Event="Reset" Value="0">1</Publish>\r
+          <Publish Event="EndDialog" Value="Return">NOT BaseBrowse</Publish>\r
+          <Publish Event="SpawnDialog" Value="Cancel">BaseBrowse</Publish>\r
+        </Control>\r
+        <Control Id="ComboText" Type="Text" X="10" Y="13" Width="54" Height="15" TabSkip="no">\r
+          <Text>&amp;Look in:</Text>\r
+        </Control>\r
+        <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">\r
+          <Text></Text>\r
+          <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />\r
+        </Control>\r
+        <Control Id="Up" Type="PushButton" X="300" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="UpBmp">\r
+          <Publish Event="DirectoryListUp" Value="0">1</Publish>\r
+        </Control>\r
+        <Control Id="NewFolder" Type="PushButton" X="320" Y="9" Width="17" Height="17" Icon="yes" FixedSize="yes" IconSize="16" Text="NewBmp">\r
+          <Publish Event="DirectoryListNew" Value="0">1</Publish>\r
+        </Control>\r
+        <Control Id="List" Type="DirectoryList" X="8" Y="29" Width="330" Height="115" Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />\r
       </Dialog>
       
 <!-- Welcome dialog -->
         <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>
           <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>
         <!-- 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>
         <Control Id="lgpl_rtf" Type="ScrollableText" X="5" Y="73" Width="365" Height="155" Sunken="yes">
           <Text src="lgpl.rtf" />
         </Control>
+      </Dialog>\r
+      \r
+<!-- Feature selection dialog -->\r
+\r
+      <Dialog Id="Selection_Dialog" Width="375" Height="270" Title="psqlODBC (libpq) $(var.VERSION)" CustomPalette="yes">\r
+       
+        <!-- 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" />\r
+            \r
+        <!-- dialog buttons -->\r
+        <Control Id="Next" Type="PushButton" X="244" Y="244" Width="56" Height="17" Default="yes">\r
+          <Text>&amp;Next &gt;</Text>\r
+          <Publish Event="NewDialog" Value="Ready_Dialog">1</Publish>\r
+        </Control>\r
+        <Control Id="Previous" Type="PushButton" X="189" Y="244" Width="56" Height="17">\r
+          <Text>&lt; &amp;Back</Text>\r
+          <Publish Event="NewDialog" Value="Licence_Dialog">1</Publish>\r
+        </Control>\r
+        <Control Id="Cancel" Type="PushButton" X="309" Y="244" Width="56" Height="17" Cancel="yes">\r
+          <Text>Cancel</Text>\r
+          <Publish Event="SpawnDialog" Value="Cancel">1</Publish>\r
+        </Control>\r
+            \r
+        <!-- dialog specific controls -->\r
+        <Control Id="ot1" Type="Text" X="8" Y="16" Width="365" Height="15" Transparent="yes">\r
+          <Text>{\Arial10Bold}Feature selection</Text>\r
+        </Control>\r
+        <Control Id="FeatureTree" Type="SelectionTree" X="5" Y="56" Width="205" Height="133" Property="_BrowseProperty" />\r
+        <Control Id="SelectionFrame" Type="GroupBox" X="216" Y="51" Width="150" Height="135" />\r
+        <Control Id="ItemDescription" Type="Text" X="221" Y="61" Width="136" Height="80">\r
+          <Subscribe Event="SelectionDescription" Attribute="Text" />\r
+        </Control>\r
+        <Control Id="Size" Type="Text" X="221" Y="135" Width="137" Height="45">\r
+          <Subscribe Event="SelectionSize" Attribute="Text" />\r
+        </Control>\r
+        <Control Id="LocationFrame" Type="GroupBox" X="5" Y="190" Width="360" Height="40" />\r
+        <Control Id="LocationPath" Type="Text" X="11" Y="213" Width="283" Height="11">\r
+          <Text>Path</Text>\r
+          <Subscribe Event="SelectionPath" Attribute="Text" /> \r
+        </Control>\r
+        <Control Id="LocationText" Type="Text" X="11" Y="200" Width="261" Height="11">\r
+          <Text>Current location:</Text>\r
+          <Subscribe Event="SelectionPathOn" Attribute="Visible" />\r
+          <Condition Action="hide">Installed</Condition>\r
+        </Control>\r
+            \r
+        <Control Id="PushButton44" Type="PushButton" X="300" Y="209" Width="56" Height="17" TabSkip="yes">\r
+          <Text>B&amp;rowse</Text>\r
+          <Publish Event="SelectionBrowse" Value="Browse">1</Publish>\r
+        </Control>\r
       </Dialog>
   
 <!-- Ready dialogue -->
         </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>
index c09129ed6669b2f27dd5d8d0c6b21183c9a34a96..9e29ccea8a0bc06674d658fce6f88753a3294cbc 100644 (file)
@@ -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 (file)
index 0000000..86f6b5a
Binary files /dev/null and b/installer/up.bmp differ