bzr commit into wex-installer-1.0 branch (iggy:545) Bug#60860

[Iggy Galarza]

#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped

  545 Iggy Galarza	2011-07-02
      Bug #60860 - Set the default catalog in the mysql-installer msi to the 64-bit variety.  The application will automatically fallback as needed.

    modified:
      Setup/Setup_Dev.wixproj
      Setup/Setup_Update.wixproj
=== modified file 'Setup/Setup_Dev.wixproj'
--- a/Setup/Setup_Dev.wixproj	2011-06-25 00:03:20 +0000
+++ b/Setup/Setup_Dev.wixproj	2011-07-02 18:01:54 +0000
@@ -20,13 +20,13 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-win32-gpl;Commercial=$(Commercial)</DefineConstants>
+    <DefineConstants>Debug;ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-winx64-gpl;Commercial=$(Commercial)</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-win32-gpl;Commercial=$(Commercial)</DefineConstants>
+    <DefineConstants>ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-winx64-gpl;Commercial=$(Commercial)</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>

=== modified file 'Setup/Setup_Update.wixproj'
--- a/Setup/Setup_Update.wixproj	2011-07-01 20:52:12 +0000
+++ b/Setup/Setup_Update.wixproj	2011-07-02 18:01:54 +0000
@@ -16,13 +16,13 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-win32-gpl</DefineConstants>
+    <DefineConstants>Debug;ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-winx64-gpl</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-win32-gpl</DefineConstants>
+    <DefineConstants>ProductVersion=$(WexVersion);ProductName=MySQL Installer;CatalogName=mysql-$(ServerVersion)-winx64-gpl</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>


Attachment: [text/bzr-bundle] bzr/[e-mail]