List:Commits« Previous MessageNext Message »
From:Mike Lischke Date:February 25 2011 9:16am
Subject:bzr commit into wex-installer-1.0 branch (mike.lischke:340)
View as plain text  
#At file:///D:/Work/MySQL/installer/ based on revid:reggie.burnett@stripped

  340 Mike Lischke	2011-02-25
      - Examples: Set output paths to the product cache. Doesn't make sense to manually copy the files if we can get them there automatically.
      - Setup: use wix variable to find correct path of the product cache.
      - Setup: added references to projects they depend on, so they get build in proper order.
      - Added product cache and generated products.xml file to be ignored by bzr.

    modified:
      .bzrignore
      Examples/Examples 5.1.wixproj
      Examples/Examples 5.5.wixproj
      Setup/Product.wxs
      Setup/Setup_Net.wixproj
      Setup/Setup_Web.wixproj
      installer-vs2010.sln
=== modified file '.bzrignore'
=== modified file '.bzrignore'
--- a/.bzrignore	2011-02-07 21:39:59 +0000
+++ b/.bzrignore	2011-02-25 09:16:00 +0000
@@ -4,3 +4,5 @@
 Setup/ProductCache
 *.suo
 **/*.user
+ProductCache
+Setup/products.xml

=== modified file 'Examples/Examples 5.1.wixproj'
--- a/Examples/Examples 5.1.wixproj	2011-02-14 17:48:38 +0000
+++ b/Examples/Examples 5.1.wixproj	2011-02-25 09:16:00 +0000
@@ -13,13 +13,13 @@
     <Name>Examples 5.1</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\ProductCache\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\ProductCache\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>

=== modified file 'Examples/Examples 5.5.wixproj'
--- a/Examples/Examples 5.5.wixproj	2011-02-15 16:20:37 +0000
+++ b/Examples/Examples 5.5.wixproj	2011-02-25 09:16:00 +0000
@@ -12,13 +12,13 @@
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\ProductCache\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\ProductCache\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>

=== modified file 'Setup/Product.wxs'
--- a/Setup/Product.wxs	2011-02-15 16:20:37 +0000
+++ b/Setup/Product.wxs	2011-02-25 09:16:00 +0000
@@ -61,13 +61,13 @@
             <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="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.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.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"/>
+                <File Id="server55" Name="mysql-5.5.9-win32.msi" Source="$(var.SolutionDir)ProductCache\mysql-5.5.9-win32.msi"/>
+                <File Id="workbench" Name="mysql-workbench-gpl-5.2.31a-win32.msi" Source="$(var.SolutionDir)ProductCache\mysql-workbench-gpl-5.2.31a-win32.msi"/>
+                <File Id="connector_odbc" Name="mysql-connector-odbc-5.1.8-win32.msi" Source="$(var.SolutionDir)ProductCache\mysql-connector-odbc-5.1.8-win32.msi"/>
+                <File Id="connector_cpp" Name="mysql-connector-c++-1.1.0-win32.msi" Source="$(var.SolutionDir)ProductCache\mysql-connector-c++-1.1.0-win32.msi"/>
+                <File Id="connector_c" Name="mysql-connector-c-6.0.2-win32.msi" Source="$(var.SolutionDir)ProductCache\mysql-connector-c-6.0.2-win32.msi"/>
+                <File Id="examples" Name="mysql-examples-5.5.0.msi" Source="$(var.SolutionDir)ProductCache\mysql-examples-5.5.0.msi"/>
+                <!--<File Id="universion_docs" Name="mysql-universal-installer-document-bundle-1.0.0.0.msi" Source="$(var.SolutionDir)ProductCache\mysql-universal-installer-document-bundle-1.0.0.0.msi"/>-->
               </Component>
             </Directory>
           </Directory>

=== modified file 'Setup/Setup_Net.wixproj'
--- a/Setup/Setup_Net.wixproj	2011-02-15 16:20:37 +0000
+++ b/Setup/Setup_Net.wixproj	2011-02-25 09:16:00 +0000
@@ -10,6 +10,8 @@
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -42,6 +44,48 @@
       <Name>WixNetFxExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Examples\Examples 5.1.wixproj">
+      <Name>Examples 5.1</Name>
+      <Project>{13190f97-5d72-4949-a77a-500a57da44bb}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\Examples\Examples 5.5.wixproj">
+      <Name>Examples 5.5</Name>
+      <Project>{d2e2842e-20b1-4167-8fe4-32ccd9d63214}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\StandardPlugins\StandardPlugins.csproj">
+      <Name>StandardPlugins</Name>
+      <Project>{c471dbda-2afa-4ea3-970a-795133f1fe1a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\WexInstaller.Core\WexInstaller.Core.csproj">
+      <Name>WexInstaller.Core</Name>
+      <Project>{64664a39-d6c5-4842-a879-bdd915dddccf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\WexInstaller\WexInstaller.csproj">
+      <Name>WexInstaller</Name>
+      <Project>{07b31f5a-9f17-4acf-b3b6-2af9000b1414}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent />

=== modified file 'Setup/Setup_Web.wixproj'
--- a/Setup/Setup_Web.wixproj	2011-02-09 23:58:01 +0000
+++ b/Setup/Setup_Web.wixproj	2011-02-25 09:16:00 +0000
@@ -36,6 +36,48 @@
       <Name>WixNetFxExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Examples\Examples 5.1.wixproj">
+      <Name>Examples 5.1</Name>
+      <Project>{13190f97-5d72-4949-a77a-500a57da44bb}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\Examples\Examples 5.5.wixproj">
+      <Name>Examples 5.5</Name>
+      <Project>{d2e2842e-20b1-4167-8fe4-32ccd9d63214}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\StandardPlugins\StandardPlugins.csproj">
+      <Name>StandardPlugins</Name>
+      <Project>{c471dbda-2afa-4ea3-970a-795133f1fe1a}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\WexInstaller.Core\WexInstaller.Core.csproj">
+      <Name>WexInstaller.Core</Name>
+      <Project>{64664a39-d6c5-4842-a879-bdd915dddccf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\WexInstaller\WexInstaller.csproj">
+      <Name>WexInstaller</Name>
+      <Project>{07b31f5a-9f17-4acf-b3b6-2af9000b1414}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLLOCATION</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent />

=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln	2011-02-15 16:20:37 +0000
+++ b/installer-vs2010.sln	2011-02-25 09:16:00 +0000
@@ -20,6 +20,12 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WexInstaller.Core", "WexInstaller.Core\WexInstaller.Core.csproj", "{64664A39-D6C5-4842-A879-BDD915DDDCCF}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Net", "Setup\Setup_Net.wixproj", "{FBC6C598-EC89-49E6-8FE4-4140141761CC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D2E2842E-20B1-4167-8FE4-32CCD9D63214} = {D2E2842E-20B1-4167-8FE4-32CCD9D63214}
+		{64664A39-D6C5-4842-A879-BDD915DDDCCF} = {64664A39-D6C5-4842-A879-BDD915DDDCCF}
+		{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414} = {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}
+		{13190F97-5D72-4949-A77A-500A57DA44BB} = {13190F97-5D72-4949-A77A-500A57DA44BB}
+	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Web", "Setup\Setup_Web.wixproj", "{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}"
 EndProject


Attachment: [text/bzr-bundle] bzr/mike.lischke@oracle.com-20110225091600-b6qpcpncdf0uasc2.bundle
Thread
bzr commit into wex-installer-1.0 branch (mike.lischke:340) Mike Lischke25 Feb