bzr commit into wex-installer-1.0 branch (reggie.burnett:257)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/wex/installer/ based on revid:reggie.burnett@stripped

  257 Reggie Burnett	2011-01-17
      updated products.xml for testing

    modified:
      Setup_Net/products.xml
=== modified file 'Setup_Net/products.xml'
=== modified file 'Setup_Net/products.xml'
--- a/Setup_Net/products.xml	2011-01-17 17:05:19 +0000
+++ b/Setup_Net/products.xml	2011-01-17 17:07:20 +0000
@@ -1,24 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ProductManifest>
-
+<ProductManifest version="1.0">
   <ProductCatalogs>
+    
     <ProductCatalog id="mysql-5.5-gpl" name="MySQL 5.5" description="MySQL 5.5 Community Edition" commercial="false" default="true">
+      <SetupTypes>
+        <SetupType flag="1" name="Developer Default" description="Installs all products needed for MySQL development, including"/>
+        <SetupType flag="2" name="Server only" description="Installs only the MySQL Server product. Use this type for servers that do not need developer resources"/>
+        <SetupType flag="64" name="Full" description="Installs all products from this catalog"/>
+        <SetupType flag="128" name="Custom" description="The user can select which products to install"/>
+      </SetupTypes>
+      <CatalogProducts>
+        <CatalogProduct productId="mysql-server-5.5-gpl" setupTypeFlags="3"/>
+        <CatalogProduct productId="workbench" setupTypeFlags="1"/>
+        <CatalogProduct productId="connector-odbc" setupTypeFlags="1"/>
+        <CatalogProduct productId="connector-c" setupTypeFlags="1"/>
+        <CatalogProduct productId="connector-cpp" setupTypeFlags="1"/>
+      </CatalogProducts>
     </ProductCatalog>
+    
     <ProductCatalog id="mysql-5.5-com" name="MySQL 5.5" description="MySQL 5.5 Commercial Edition" commercial="true" default="false">
-      <Products>
-        <Product id="Connector-net" />
-      </Products>
+      <SetupTypes>
+        <SetupType name="Developer Default" description="Installs all products needed for MySQL development, including"/>
+        <SetupType name="Server only" description="Installs only the MySQL Server product. Use this type for servers that do not need developer resources"/>
+        <SetupType name="Full" description="Installs all products from this catalog"/>
+        <SetupType name="Custom" description="The user can select which products to install"/>
+      </SetupTypes>
     </ProductCatalog>
     <ProductCatalog id="mysql-5.1-gpl" name="MySQL 5.1" description="MySQL 5.1 Community Edition" commercial="false" default="false">
+      <SetupTypes>
+        <SetupType name="Developer Default" description="Installs all products needed for MySQL development, including"/>
+        <SetupType name="Server only" description="Installs only the MySQL Server product. Use this type for servers that do not need developer resources"/>
+        <SetupType name="Full" description="Installs all products from this catalog"/>
+        <SetupType name="Custom" description="The user can select which products to install"/>
+      </SetupTypes>
     </ProductCatalog>
   </ProductCatalogs>
 
   <ProductCategories>
     <ProductCategory name="Server" title="MySql Servers" description="MySQL Database Servers">
-      <Product name="mysql-server" title="MySQL Server" description="The core MySQL database server" default="true" upgradeId="{49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3}" urlBaseDir="mysql-5.5">
+      <Product name="mysql-server-5.5-gpl" title="MySQL Server" description="The core MySQL database server" upgradeId="{49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3}" urlBaseDir="mysql-5.5">
         <Packages>
-          <Package id="{A2DDB7E9-6AD9-4482-9DDB-FC352B6C75B1}" type="MSI" arch="X86" filename="mysql-5.5.7-rc-win32.msi" thisVersion="5.5.7">
+          <Package id="{A89C6DB0-E5BE-44A0-99DA-72918C1CCFDE}" type="MSI" arch="X86" filename="mysql-5.5.8-win32.msi" thisVersion="5.5.8">
             <Feature name="MYSQLSERVER" title="MySQL Server" description="Install MySQL Server." size="0" default="true" display="true" hasComponents="true">
               <Feature name="DebugBinaries" title="Debug binaries" description="Debug/trace versions of executables and libraries" default="true" display="true" hasComponents="true"/>
               <Feature name="Client" title="Client Programs" description="Various helpful (commandline) tools including the mysql command line client" default="true" display="true" hasComponents="true" />
@@ -42,9 +65,9 @@
     </ProductCategory>
 
     <ProductCategory name="Application" title="Applications" description="Applications that work with MySQL">
-      <Product name="Workbench" title="MySQL Workbench" description="The MySQL GUI Developer tool" default="true" upgradeId="{84C668F4-A0C9-4585-A463-AADE0EFC9391}" urlBaseDir="MySQLGUITools">
+      <Product name="workbench" title="MySQL Workbench" description="The MySQL GUI Developer tool" upgradeId="{84C668F4-A0C9-4585-A463-AADE0EFC9391}" urlBaseDir="MySQLGUITools">
         <Packages>
-          <Package id="{38766225-85FA-469B-A373-82BF1923A7E4}" type="MSI" arch="X86" filename="mysql-workbench-gpl-5.2.29-win32.msi" thisVersion="5.2.29">
+          <Package id="{38766225-85FA-469B-A373-82BF1923A7E4}" type="MSI" arch="X86" filename="mysql-workbench-gpl-5.2.31a-win32.msi" thisVersion="5.2.31">
             <Feature name="MysqlWorkbenchCore" title="MySQL Workbench Core" description="Core components needed to run MySQL Workbench" size="0" default="true" display="true" hasComponents="true"/>
             <Feature name="UpdateWizard" title="Update Feature" description="Built in update feature that connects to MySQL.com" size="0" default="true" display="true" hasComponents="true"/>
           </Package>
@@ -53,7 +76,7 @@
     </ProductCategory>
 
     <ProductCategory name="Connector" title="MySQL Connectors" description="Database drivers for programming languages">
-      <Product name="Connector-odbc" title="Connector/ODBC" description="MySQL Connector for ODBC" default="false" upgradeId="{FF073FBB-32E2-4052-B6B2-830C5ED4A809}" urlBaseDir="mysql-connector-odbc-5.1">
+      <Product name="connector-odbc" title="Connector/ODBC" description="MySQL Connector for ODBC" upgradeId="{FF073FBB-32E2-4052-B6B2-830C5ED4A809}" urlBaseDir="mysql-connector-odbc-5.1">
         <Packages>
           <Package id="{29042B1C-0713-4575-B7CA-5C8E7B0899D4}" type="MSI" arch="X86" filename="mysql-connector-odbc-5.1.6-win32.msi" thisVersion="5.1.6">
             <Feature name="ODBC_32" title="MySQL Connector/ODBC driver"  default="true" description="Installs the MySQL ODBC 5.1.6 32-bit driver." display="true" hasComponents="true"/>
@@ -62,7 +85,7 @@
         </Packages>
       </Product>
 
-      <Product name="Connector-cpp" title="Connector/C++" description="MySQL Connector for C++" default="false" upgradeId="{FE990D78-8BB1-4880-930A-0430E707F3CA}" urlBaseDir="">
+      <Product name="connector-cpp" title="Connector/C++" description="MySQL Connector for C++" upgradeId="{FE990D78-8BB1-4880-930A-0430E707F3CA}" urlBaseDir="">
         <Packages>
           <Package id="{C13C9E31-F8D7-464D-A246-5A42AC0AB93E}" type="MSI" arch="X86" filename="mysql-connector-c++-1.0.5-win32.msi" thisVersion="1.0.5">
             <Feature name="ConnectorCPP" title="MySQL Connector C++" default="true" description="The MySQL Connector C++ client library." display="true" hasComponents="true"/>
@@ -71,7 +94,7 @@
         </Packages>
       </Product>
 
-      <Product name="Connector-C" title="Connector/C" description="MySQL Connector for C" default="false" upgradeId="" urlBaseDir="">
+      <Product name="connector-C" title="Connector/C" description="MySQL Connector for C" upgradeId="" urlBaseDir="">
         <Packages>
           <Package id="{66F9302D-E145-4375-8C84-54DA2339C483}" type="MSI" arch="X86" filename="mysql-connector-c-6.0.2-win32.msi" thisVersion="6.0.2">
             <Feature name="ConnectorC" title="MySQL Connector C" default="true" description="The MySQL Connector C client library." display="true" hasComponents="true"/>


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