List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:February 15 2011 4:20pm
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:339)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@stripped

  339 Reggie Burnett	2011-02-15
      - suppress pdb output for 5.5 examples setup
      - change insatll location to say 5.5 instead of 5.1 for 5.5 examples
      - filename tweaks to setup project file
      - trimmed manifest-base.xml down to bare information
      - removed Wix_CustomAction from solution

    modified:
      Examples/Examples 5.5.wixproj
      Examples/Product_55.wxs
      Setup/Product.wxs
      Setup/Setup_Net.wixproj
      Setup/manifest-base.xml
      installer-vs2010.sln
=== modified file 'Examples/Examples 5.5.wixproj'
=== modified file 'Examples/Examples 5.5.wixproj'
--- a/Examples/Examples 5.5.wixproj	2011-02-14 19:40:32 +0000
+++ b/Examples/Examples 5.5.wixproj	2011-02-15 16:20:37 +0000
@@ -15,6 +15,7 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>

=== modified file 'Examples/Product_55.wxs'
--- a/Examples/Product_55.wxs	2011-02-14 17:48:38 +0000
+++ b/Examples/Product_55.wxs	2011-02-15 16:20:37 +0000
@@ -8,7 +8,7 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
         <Directory Id="MySQLFolder" Name="MySQL">
-          <Directory Id="INSTALLLOCATION" Name="MySQL Examples and Samples 5.1">
+          <Directory Id="INSTALLLOCATION" Name="MySQL Examples and Samples 5.5">
             <Component Id="C_RegistryKey" Guid="">
               <RegistryKey Id="MainRegistryKey" Action="createAndRemoveOnUninstall" Root="HKLM" Key="Software\MySQL AB\MySQL Examples and Samples 5.5">
                 <RegistryValue Name="Location" Value="[INSTALLLOCATION]" Type="string"/>

=== modified file 'Setup/Product.wxs'
--- a/Setup/Product.wxs	2011-02-14 19:40:32 +0000
+++ b/Setup/Product.wxs	2011-02-15 16:20:37 +0000
@@ -60,13 +60,13 @@
             </Component>
             <Directory Id="ProductCache" Name="Product Cache">
               <Component Id="Products" Guid="">
-                <File Id="server51" Name="mysql-5.1.54-win32.msi" Source="ProductCache\mysql-5.1.54-win32.msi"/>
+                <!--<File Id="server51" Name="mysql-5.1.54-win32.msi" Source="ProductCache\mysql-5.1.54-win32.msi"/>-->
                 <File Id="server55" Name="mysql-5.5.8-win32.msi" Source="ProductCache\mysql-5.5.8-win32.msi"/>
-                <File Id="workbench" Name="mysql-workbench-gpl-5.2.31a-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.31a-win32.msi"/>
+                <File Id="workbench" Name="mysql-workbench-gpl-5.2.32-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.32-win32.msi"/>
                 <File Id="connector_odbc" Name="mysql-connector-odbc-5.1.6-win32.msi" Source="ProductCache\mysql-connector-odbc-5.1.6-win32.msi"/>
                 <File Id="connector_cpp" Name="mysql-connector-c++-1.0.5-win32.msi" Source="ProductCache\mysql-connector-c++-1.0.5-win32.msi"/>
                 <File Id="connector_c" Name="mysql-connector-c-6.0.2-win32.msi" Source="ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
-                <File Id="examples" Name="mysql-examples-5.1.0.msi" Source="ProductCache\mysql-examples-5.1.0.msi"/>
+                <File Id="examples" Name="mysql-examples-5.5.0.msi" Source="ProductCache\mysql-examples-5.5.0.msi"/>
                 <File Id="universion_docs" Name="mysql-universal-installer-document-bundle-1.0.0.0.msi" Source="ProductCache\mysql-universal-installer-document-bundle-1.0.0.0.msi"/>
               </Component>
             </Directory>

=== modified file 'Setup/Setup_Net.wixproj'
--- a/Setup/Setup_Net.wixproj	2011-02-14 17:48:38 +0000
+++ b/Setup/Setup_Net.wixproj	2011-02-15 16:20:37 +0000
@@ -27,6 +27,7 @@
     <Content Include="config.xml" />
     <Content Include="manifest-base.xml" />
     <Content Include="my-template.ini" />
+    <Content Include="products.xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />

=== modified file 'Setup/manifest-base.xml'
--- a/Setup/manifest-base.xml	2011-02-14 17:48:38 +0000
+++ b/Setup/manifest-base.xml	2011-02-15 16:20:37 +0000
@@ -17,6 +17,7 @@
         <CatalogProduct productId="connector-odbc" setupTypeFlags="1" />
         <CatalogProduct productId="connector-c" setupTypeFlags="1" />
         <CatalogProduct productId="connector-cpp" setupTypeFlags="1" />
+        <CatalogProduct productId="examples-5.5" setupTypeFlags="1"/>
       </CatalogProducts>
     </ProductCatalog>
     <ProductCatalog id="mysql-5.1-gpl" name="MySQL 5.1" description="MySQL 5.1 Community Edition" commercial="false">
@@ -38,111 +39,68 @@
   </ProductCatalogs>
   <ProductCategories>
     <ProductCategory name="Server" title="MySql Servers" description="MySQL Database Servers">
-      <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">
+      <Product name="mysql-server-5.5-gpl" title="MySQL Server" description="The core MySQL database server" 
+               upgradeId="" urlBaseDir="mysql-5.5">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-5.5.8-win32.msi" id="{A89C6DB0-E5BE-44A0-99DA-72918C1CCFDE}" thisVersion="5.5.8">
-            <Feature name="MYSQLSERVER" title="MySQL Server" description="Install MySQL Server." default="true" size="0" display="0" hasComponents="true">
-              <Feature name="DebugBinaries" title="Debug binaries" description="Debug/trace versions of executables and libraries" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Client" title="Client Programs" description="Various helpful (commandline) tools including the mysql command line client" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="DEVEL" title="Development Components" description="Installs C/C++ header files and libraries" default="true" size="0" display="0" hasComponents="true">
-              <Feature name="SharedLibraries" title="Client C API library (shared)" description="Installs shared client library" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Embedded" title="Embedded server library" description="Installs embedded server library" default="false" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="DEBUGSYMBOLS" title="Debug Symbols" description="Installs Debug Symbols" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="MISC" title="MISC" description="MISC" default="true" size="0" display="0" hasComponents="0">
-              <Feature name="IniFiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Server_Scripts" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="InstanceConfig" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ProgramMenu" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="UserEditableDatafiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="RegKeys" title="" description="" default="true" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-5.5.8-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
       <Product name="mysql-server-5.1-gpl" title="MySQL Server" description="The core MySQL database server" 
-               upgradeId="{49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3}" urlBaseDir="mysql-5.1">
+               upgradeId="" urlBaseDir="mysql-5.1">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-5.1.54-win32.msi" id="{2430887C-B8A8-49D8-9185-9F451185AF7B}" thisVersion="5.1.54">
-            <Feature name="SERVER" title="MySQL Server" description="Install MySQL Server." default="true" size="0" display="0" hasComponents="true">
-              <Feature name="DebugBinaries" title="Debug binaries" description="Debug/trace versions of executables and libraries" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Client" title="Client Programs" description="Various helpful (commandline) tools including the mysql command line client" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="ClientPrograms" title="Client Programs" description="Various helpful (commandline) tools including the mysql-command-line-shell" default="true" size="0" display="0" hasComponents="true">
-              <Feature name="SharedLibraries" title="Client C API library (shared)" description="Installs shared client library" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Embedded" title="Embedded server library" description="Installs embedded server library" default="false" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="DEBUGSYMBOLS" title="Debug Symbols" description="Installs Debug Symbols" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="MISC" title="MISC" description="MISC" default="true" size="0" display="0" hasComponents="0">
-              <Feature name="IniFiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-              <Feature name="Server_Scripts" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            </Feature>
-            <Feature name="InstanceConfig" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ProgramMenu" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="UserEditableDatafiles" title="" description="" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="RegKeys" title="" description="" default="true" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-5.1.54-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
     </ProductCategory>
     <ProductCategory name="Application" title="Applications" description="Applications that work with MySQL">
-      <Product name="workbench" title="MySQL Workbench" description="The MySQL GUI Developer tool" upgradeId="{84C668F4-A0C9-4585-A463-AADE0EFC9391}" urlBaseDir="MySQLGUITools">
+      <Product name="workbench" title="MySQL Workbench" description="The MySQL GUI Developer tool" upgradeId="" urlBaseDir="MySQLGUITools">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-workbench-gpl-5.2.31a-win32.msi" id="{7CB4BD9D-5CDA-4DEC-9C88-A300C569A2A5}" thisVersion="5.2.31">
-            <Feature name="MysqlWorkbenchCore" title="MySQL Workbench Core" description="Core components needed to run MySQL Workbench" default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="UpdateWizard" title="Update Feature" description="Built in update feature that connects to MySQL.com" default="true" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-workbench-gpl-5.2.31a-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
     </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" 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="" urlBaseDir="mysql-connector-odbc-5.1">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-odbc-5.1.6-win32.msi" id="{29042B1C-0713-4575-B7CA-5C8E7B0899D4}" thisVersion="5.1.6">
-            <Feature name="ODBC_32" title="MySQL Connector/ODBC driver" description="Installs the MySQL ODBC 5.1.6 32-bit driver." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="Help" title="MySQL Connector/ODBC 5.1.6 Documentation" description="Installs the MySQL ODBC driver help." default="true" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-connector-odbc-5.1.6-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
-      <Product name="connector-cpp" title="Connector/C++" description="MySQL Connector for C++" upgradeId="{FE990D78-8BB1-4880-930A-0430E707F3CA}" urlBaseDir="">
+      <Product name="connector-cpp" title="Connector/C++" description="MySQL Connector for C++" upgradeId="" urlBaseDir="">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-c++-1.0.5-win32.msi" id="{C13C9E31-F8D7-464D-A246-5A42AC0AB93E}" thisVersion="1.0.5">
-            <Feature name="ConnectorCPP" title="MySQL Connector C++" description="The MySQL Connector C++ client library." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="DebugLibraries" title="Debug Libary" description="Debug library and symbols." default="false" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-connector-c++-1.0.5-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
       <Product name="connector-C" title="Connector/C" description="MySQL Connector for C" upgradeId="" urlBaseDir="">
         <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-connector-c-6.0.2-win32.msi" id="{66F9302D-E145-4375-8C84-54DA2339C483}" thisVersion="6.0.2">
-            <Feature name="ConnectorC" title="MySQL Connector C" description="The MySQL Connector C client library." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="DebugLibraries" title="Debug Libary" description="Debug library and symbols." default="false" size="0" display="0" hasComponents="true" />
+          <Package type="MSI" arch="X86" filename="mysql-connector-c-6.0.2-win32.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>
     </ProductCategory>
     <ProductCategory name="Documentation" title="Documentation" description="">
-      <Product name="Universal-Docs" title="MySQL Documentation" description="A collection of popular MySQL Documents" upgradeId="{D884632C-A8F2-46E6-9944-F784F5C6A10A}" urlBaseDir="http://wb.mysql.com/installer">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-universal-installer-document-bundle-1.0.0.0.msi" id="{C2AF9668-BC9E-412F-B766-D8238A8517B0}" thisVersion="1.0.0">
-            <Feature name="ConnCPPA4" title="MySQL Connector C++ User Guide A4" description="The MySQL Connector C++ User Guide in A4 format." default="false" size="0" display="0" hasComponents="true" />
-            <Feature name="ConnCPP" title="MySQL Connector C++ User Guide" description="The MySQL Connector C++ User Guide." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ConnNETA4" title="MySQL Connector .NET User Guide A4" description="The MySQL Connector .NET User Guide in A4 fomat" default="false" size="0" display="0" hasComponents="true" />
-            <Feature name="ConnNET" title="MySQL Connector .NET User Guide" description="The MySQL Connector .NET User Guide." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ConnODBCA4" title="MySQL Connector ODBC User Guide A4" description="The MySQL Connector ODBC User Guide in A4 format." default="false" size="0" display="0" hasComponents="true" />
-            <Feature name="ConnODBC" title="MySQL Connector ODBC User Guide" description="The MySQL Connector ODBC User Guide." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="ServerA4Feature" title="MySQL Server User Guide A4" description="The MySQL Server User Guide in A4 format." default="false" size="0" display="0" hasComponents="true" />
-            <Feature name="ServerFeature" title="MySQL Server User Guide" description="The MySQL Server User Guide." default="true" size="0" display="0" hasComponents="true" />
-            <Feature name="WBA4Feature" title="MySQL Workbench User Guide A4" description="MySQL Workbench User Guide in A4 format." default="false" size="0" display="0" hasComponents="true" />
-            <Feature name="WBFeature" title="MySQL Workbench User Guide" description="The MySQL Workbench User Guide." default="true" size="0" display="0" hasComponents="true" />
-          </Package>
-        </Packages>
-      </Product>
-      <Product name="examples-5.1" title="Samples and Examples" description="A collection of examples and sample databases to help a developer get started." upgradeId="8C8219CB-78A4-4AF8-8D49-F36FB1FE3320" urlBaseDir="http://wb.mysql.com/installer">
-        <Packages>
-          <Package type="MSI" arch="X86" filename="mysql-examples-5.1.0.msi" id="{46B63307-6F7C-4E85-A77B-FA97365DF153}" thisVersion="5.1.0">
-            <Feature name="SampleDB" title="Sample Databases" description="Some interesting sample databases" default="true" size="0" display="0" hasComponents="true" />
+      <Product name="Universal-Docs" title="MySQL Documentation" description="A collection of popular MySQL Documents" 
+               upgradeId="" urlBaseDir="http://wb.mysql.com/installer">
+        <Packages>
+          <Package type="MSI" arch="X86" filename="mysql-universal-installer-document-bundle-1.0.0.0.msi" id="" thisVersion="">
+          </Package>
+        </Packages>
+      </Product>
+      <Product name="examples-5.1" title="Samples and Examples" description="A collection of examples and sample databases to help a developer get started." 
+               upgradeId="" urlBaseDir="http://wb.mysql.com/installer">
+        <Packages>
+          <Package type="MSI" arch="X86" filename="mysql-examples-5.1.0.msi" id="" thisVersion="">
+          </Package>
+        </Packages>
+      </Product>
+      <Product name="examples-5.5" title="Samples and Examples" description="A collection of examples and sample databases to help a developer get started." 
+               upgradeId="" urlBaseDir="http://wb.mysql.com/installer">
+        <Packages>
+          <Package type="MSI" arch="X86" filename="mysql-examples-5.5.0.msi" id="" thisVersion="">
           </Package>
         </Packages>
       </Product>

=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln	2011-02-14 17:48:38 +0000
+++ b/installer-vs2010.sln	2011-02-15 16:20:37 +0000
@@ -23,8 +23,6 @@
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Web", "Setup\Setup_Web.wixproj", "{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WiX_CustomAction", "WiX_CustomAction\WiX_CustomAction.vcxproj", "{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQLCA", "MySQLCA\MySQLCA.csproj", "{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManifestUpdater", "ManifestUpdater\ManifestUpdater.csproj", "{57913AF9-D535-4B13-A088-8DF74FD47A53}"
@@ -155,18 +153,6 @@
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|Win32.ActiveCfg = Release|x86
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|x86.ActiveCfg = Release|x86
 		{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|x86.Build.0 = Release|x86
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|Win32.Build.0 = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Debug|x86.ActiveCfg = Debug|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Any CPU.ActiveCfg = Release|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Win32.ActiveCfg = Release|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|Win32.Build.0 = Release|Win32
-		{E90F3B47-A980-4428-9A7C-2B1A68F9EA91}.Release|x86.ActiveCfg = Release|Win32
 		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9B6E4CA6-C2D6-4782-BF70-98E9BB4CAE8D}.Debug|Mixed Platforms.Build.0 = Debug|x86


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110215162037-1v4p0ghiw6qs993y.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:339) Reggie Burnett15 Feb