=== modified file 'wix/CMakeLists.txt'
--- wix/CMakeLists.txt	2010-08-19 15:37:55 +0000
+++ wix/CMakeLists.txt	2010-09-09 18:55:09 +0000
@@ -22,6 +22,8 @@
 
 ##########################################################################
 
+cmake_minimum_required(VERSION 2.4.6)
+
 PROJECT(MYODBC_MSI_INSTALLER)
 
 #-------------- wix installer ------------------------
@@ -31,21 +33,21 @@
   IF(WIX_DIR)
     FILE(REMOVE "myodbc_version.xml")
     TRY_RUN(VERSION_OUT VERSION_TEST 
-	    "${CMAKE_SOURCE_DIR}"
-	    "${CMAKE_SOURCE_DIR}/cmake/getodbcversion.c" 
-	    ARGS "myodbc_version.xml")
+            "${CMAKE_SOURCE_DIR}"
+            "${CMAKE_SOURCE_DIR}/cmake/getodbcversion.c" 
+            ARGS "myodbc_version.xml")
     IF(NOT VERSION_OUT STREQUAL "0")
-    	MESSAGE(ERROR "Can't create myodbc_version.xml")
+        MESSAGE(ERROR "Can't create myodbc_version.xml")
     ENDIF(NOT VERSION_OUT STREQUAL "0")
   ENDIF(WIX_DIR)
   # --------------------------------------------------
 
   # -------------- find binary resources -------------
   FIND_PATH(WIX_RESOURCE MySQLConnector.ico
-	  $ENV{WIX_RESOURCE}
-	  ${CMAKE_SOURCE_DIR}/../../../wix-installer/resources)
+          $ENV{WIX_RESOURCE}
+          ${CMAKE_SOURCE_DIR}/../../../wix-installer/resources)
   IF(NOT WIX_RESOURCE)
-	  MESSAGE(ERROR "Can't find binary MySQL resource files. Please specify WIX_RESOURCE")
+          MESSAGE(ERROR "Can't find binary MySQL resource files. Please specify WIX_RESOURCE")
   ENDIF(NOT WIX_RESOURCE)
   MESSAGE(STATUS "Wix resources found in ${WIX_RESOURCE}")
   # --------------------------------------------------
@@ -79,25 +81,37 @@
     SET(MSI_PACKAGE "mysql-connector-odbc-${ODBC_VERSION}-${MSI_VERSION}.msi")
   ENDIF(${LICENSE})
 
+  # Generate GUID
+EXECUTE_PROCESS(COMMAND uuidgen
+                OUTPUT_VARIABLE CONNECTOR_PKG_ID1)
+STRING(STRIP ${CONNECTOR_PKG_ID1} CONNECTOR_PKG_ID1)
+EXECUTE_PROCESS(COMMAND uuidgen
+                OUTPUT_VARIABLE CONNECTOR_PKG_ID2)
+STRING(STRIP ${CONNECTOR_PKG_ID2} CONNECTOR_PKG_ID2)
+
 ENDIF(WIN32)
 #-----------------------------------------------------
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_odbc.xml.in
+               ${CMAKE_CURRENT_SOURCE_DIR}/mysql-odbc-${ODBC_VERSION}-${MSI_VERSION}.xml @ONLY)
+
 ADD_CUSTOM_TARGET(
-	MSI_INSTALLER ALL
-	DEPENDS ${MSI_PACKAGE})
+        MSI_INSTALLER ALL
+        DEPENDS ${MSI_PACKAGE})
 
 ADD_CUSTOM_COMMAND(
-	OUTPUT ${MSI_PACKAGE}
-	DEPENDS mysql_odbc.wixobj
+        OUTPUT ${MSI_PACKAGE}
+        DEPENDS mysql_odbc.wixobj
                 mysql_odbc_fragment.wixobj
-	COMMAND ${WIX_DIR}/light.exe mysql_odbc.wixobj mysql_odbc_fragment.wixobj -o ${MSI_PACKAGE})
-
-ADD_CUSTOM_COMMAND(
-	OUTPUT mysql_odbc_fragment.wixobj
-	DEPENDS mysql_odbc_fragment.xml
-	COMMAND ${WIX_DIR}/candle.exe mysql_odbc_fragment.xml -o mysql_odbc_fragment.wixobj)
-
-ADD_CUSTOM_COMMAND(
-	OUTPUT mysql_odbc.wixobj
-	DEPENDS mysql_odbc.xml
+        COMMAND ${WIX_DIR}/light.exe mysql_odbc.wixobj mysql_odbc_fragment.wixobj -o ${MSI_PACKAGE})
+
+ADD_CUSTOM_COMMAND(
+        OUTPUT mysql_odbc_fragment.wixobj
+        DEPENDS mysql_odbc_fragment.xml
+        COMMAND ${WIX_DIR}/candle.exe mysql_odbc_fragment.xml -o mysql_odbc_fragment.wixobj)
+
+ADD_CUSTOM_COMMAND(
+        OUTPUT mysql_odbc.wixobj
+        DEPENDS mysql_odbc.xml.in
                 mysql_common_ui.xml
-	COMMAND ${WIX_DIR}/candle.exe mysql_odbc.xml -o mysql_odbc.wixobj)
+        COMMAND ${WIX_DIR}/candle.exe mysql-odbc-${ODBC_VERSION}-${MSI_VERSION}.xml -o mysql_odbc.wixobj)

=== modified file 'wix/README.TXT'
--- wix/README.TXT	2010-08-25 13:12:56 +0000
+++ wix/README.TXT	2010-09-09 18:55:09 +0000
@@ -2,7 +2,7 @@
 
 1) Prerequisites
 
-- Wix 3.0 or above (http://wix.sourceforge.net)
+- Wix 3.0 or above (http://wix.codeplex.com/)
 - Resources from connectors-svnroot/wix-installer
 - Microsoft Visual Studio environment
 - CMake 2.4.6 (http://www.cmake.org)
@@ -15,7 +15,7 @@
 directory.
 
 - WIX_RESOURCE
-Resource directory from connectors-svnroot/wix-installer
+Resource directory from svn+ssh://<your-uid>@bk-internal.mysql.com/connectors-svnroot/wix-installer
 
 3) Copying files
 

=== added file 'wix/mysql-connector-odbc-msi-arpprops.xml'
--- wix/mysql-connector-odbc-msi-arpprops.xml	1970-01-01 00:00:00 +0000
+++ wix/mysql-connector-odbc-msi-arpprops.xml	2010-09-09 18:55:09 +0000
@@ -0,0 +1,30 @@
+<Include>
+  <Property Id="ARPCOMMENTS" Value="MySQL Connector/ODBBC 5.1 is a MySQL database connector for ODBC." />
+  <Property Id="ARPCONTACT" Value="http://www.mysql.com/about/contact/" />
+  <Property Id="ARPPRODUCTICON" Value="MySQLConnector.ico" />
+  <Property Id="ARPHELPLINK" Value="http://forums.mysql.com/list.php?37" />
+  <Property Id="ARPURLINFOABOUT" Value="http://dev.mysql.com/downloads/connector/odbc/" />
+  <Property Id="ARPURLUPDATEINFO" Value="http://dev.mysql.com/downloads/connector/odbc/" />
+  <!--Property Id="ARPHELPTELEPHONE" Value="URL where one can find support phone numbers" /-->
+  <Property Id="ARPAUTHORIZEDCDFPREFIX" Value="http://dev.mysql.com/doc/refman/5.1/en/connector-odbc.html" />
+  <Property Id="ARPSIZE" Value="3" />
+
+  <!--
+  <Property Id="ARPNOMODIFY" Value="0" />
+  <Property Id="ARPNOREPAIR" Value="0" />
+  <Property Id="ARPNOREMOVE" Value="0" />
+  <Property Id="ARPSYSTEMCOMPONENT" Value="0" />
+  -->
+
+  <Icon Id="MySQLConnector.ico" SourceFile="$(var.odbc_resource)/MySQLConnector.ico" />
+
+  <!-- Set up ARPINSTALLLOCATION property -->
+  <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+  <CustomAction Id="SetARPREADME" Property="ARPREADME" Value="[INSTALLDIR]README" />
+
+  <!-- Sequences -->
+  <InstallExecuteSequence>
+    <Custom Action="SetARPINSTALLLOCATION" After="InstallValidate"></Custom>
+    <Custom Action="SetARPREADME" After="InstallValidate"></Custom>
+  </InstallExecuteSequence>
+</Include>

=== renamed file 'wix/mysql_odbc.xml' => 'wix/mysql_odbc.xml.in'
--- wix/mysql_odbc.xml	2010-08-25 13:12:56 +0000
+++ wix/mysql_odbc.xml.in	2010-09-09 18:55:09 +0000
@@ -34,7 +34,7 @@
     SetVersion updates: Name, Id, Version. Do not change them manually.
   -->
 
-  <Product Id="29042B1C-0713-4575-B7CA-5C8E7B0899D4" UpgradeCode="FF073FBB-32E2-4052-B6B2-830C5ED4A809"
+  <Product Id="@CONNECTOR_PKG_ID1@" UpgradeCode="FF073FBB-32E2-4052-B6B2-830C5ED4A809"
     Name="MySQL Connector/ODBC $(var.odbc_ver_short)" Version="$(var.odbc_ver_long)" Language="1033" Manufacturer="Oracle Corporation">
 
   <!-- *****************************************************************************************
@@ -49,10 +49,11 @@
     <?define odbc_platform="Intel" ?>
     <?endif ?>
 
-    <Package Keywords="Installer,MSI,Database" 
+    <Package Id="@CONNECTOR_PKG_ID2@" Keywords="Installer,MSI,Database" 
       Description="MySQL Connector/ODBC" Manufacturer="Oracle Corporation"
       InstallerVersion="200" Platforms="$(var.odbc_platform)"
       Languages="1033" SummaryCodepage="1252" Compressed='yes' />
+    <?include mysql-connector-odbc-msi-arpprops.xml ?>
 
     <!-- *****************************************************************************************
       Custom Actions
@@ -66,7 +67,7 @@
 
     <Upgrade Id="FF073FBB-32E2-4052-B6B2-830C5ED4A809">
       <!-- !!!SetVersion updates: Minimum, Maximum -->
-      <UpgradeVersion Property="PREVIOUSVERSIONINSTALLED" Minimum="5.0.999" Maximum="$(var.odbc_ver_prev)" IncludeMaximum="no"
+      <UpgradeVersion Property="PREVIOUSVERSIONINSTALLED" Minimum="5.0.999" Maximum="$(var.odbc_ver_prev)" IncludeMaximum="yes"
         IncludeMinimum="yes"  />
       <!-- !!!SetVersion updates: Minimum, Maximum -->
       <UpgradeVersion Property="NEWERPRODUCTFOUND" Minimum="$(var.odbc_ver_long)" Maximum="$(var.odbc_ver_short).999" OnlyDetect="yes" 
@@ -87,8 +88,8 @@
       <Component Id="RegKeys32" Guid="AECCA4A7-9405-466A-8393-4F0876DCD21A" DiskId="1">
         <RegistryKey Id="MysqlKey32" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
                   Action="createAndRemoveOnUninstall"/>
-	<RegistryValue Id="Version32" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
-		  Name="Version" Type="string" Value="[ProductVersion]"/>
+        <RegistryValue Id="Version32" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
+                  Name="Version" Type="string" Value="[ProductVersion]"/>
       </Component>
     </DirectoryRef>
 
@@ -97,8 +98,8 @@
       <Component Id="RegKeys64" Guid="92FEC72B-EB44-4E4D-B301-A915C80D067B" DiskId="1" Win64="yes">
         <RegistryKey Id="MysqlKey64" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
                   Action="createAndRemoveOnUninstall"/>
-	<RegistryValue Id="Version64" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
-		  Name="Version" Type="string" Value="[ProductVersion]"/>
+        <RegistryValue Id="Version64" Root="HKLM" Key="SOFTWARE\MySQL AB\[ProductName]" 
+                  Name="Version" Type="string" Value="[ProductVersion]"/>
       </Component>
     </DirectoryRef>
     <?endif ?>
@@ -129,6 +130,10 @@
     </Feature>
     <?endif ?>
 
+    <!--Feature Id="Help" Title="MySQL Connector/ODBC $(var.odbc_ver_long) Documentation" Level="1" Description="Installs the MySQL ODBC driver help.">
+        <ComponentRef Id="help" />
+    </Feature-->
+
     <!-- *****************************************************************************************
       End of Feature
     -->
@@ -148,9 +153,6 @@
     <Property Id="AgreeToLicense">No</Property>
     <Property Id="ApplicationUsers">AllUsers</Property> 
     <Property Id="ALLUSERS">1</Property> <!--per-machine installation -->   
-    <Property Id="ARPPRODUCTICON">MySQLConnector.ico</Property>
-    <Property Id="ARPURLUPDATEINFO">http://dev.mysql.com/</Property>    
-    <Property Id="ARPURLINFOABOUT">http://www.mysql.com</Property>
        
     <Property Id="INSTALLLEVEL">1</Property>