#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped
326 Reggie Burnett 2011-02-09
renamed setup_net folder to Setup
moved all setup projects under the setup folder
removed:
Setup_Web/
renamed:
Setup_Net/ => Setup/
Setup_Web/Product.wxs => Setup/SetupWeb.wxs
Setup_Web/Setup_Web.wixproj => Setup/Setup_Web.wixproj
Setup_Web/Setup_Web_vs2008.wixproj => Setup/Setup_Web_vs2008.wixproj
modified:
Setup/Product.wxs
Setup/Setup_Net.wixproj
Setup/products.xml
installer-vs2010.sln
Setup/SetupWeb.wxs
Setup/Setup_Web.wixproj
=== renamed directory 'Setup_Net' => 'Setup'
=== modified file 'Setup/Product.wxs'
=== renamed directory 'Setup_Net' => 'Setup'
=== modified file 'Setup/Product.wxs'
--- a/Setup_Net/Product.wxs 2011-02-09 13:49:30 +0000
+++ b/Setup/Product.wxs 2011-02-09 23:58:01 +0000
@@ -83,10 +83,10 @@
<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-1.0.0.msi" Source="ProductCache\mysql-examples-1.0.0.msi"/>
+ <File Id="examples" Name="mysql-examples-5.1.0.msi" Source="ProductCache\mysql-examples-5.1.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="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>
</Directory>
=== renamed file 'Setup_Web/Product.wxs' => 'Setup/SetupWeb.wxs'
--- a/Setup_Web/Product.wxs 2010-11-30 20:23:23 +0000
+++ b/Setup/SetupWeb.wxs 2011-02-09 23:58:01 +0000
@@ -1,29 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<?define ProductName="MySQL Universal Installer"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+<?define ProductVersion="1.0.8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
- <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Oracle" UpgradeCode="320cf548-fde7-4202-be67-a56284b256d9">
+
+ <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)"
+ Manufacturer="Oracle"
+ UpgradeCode="87973E15-B594-4EC5-B80F-6BBF4623E7C4">
<Package InstallerVersion="200" Compressed="yes" />
- <Upgrade Id="320cf548-fde7-4202-be67-a56284b256d9">
- <UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
- <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
+ <Upgrade Id="87973E15-B594-4EC5-B80F-6BBF4623E7C4">
+ <UpgradeVersion OnlyDetect="no" Minimum="$(var.ProductVersion)" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
+ <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="yes" />
</Upgrade>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
- <Icon Id="UnifiedInstaller.exe" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
+ <Icon Id="InstallerIcon.exe" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
+ <Property Id="ARPPRODUCTICON" Value="InstallerIcon.exe"/>
<Directory Id="TARGETDIR" Name="SourceDir">
<!-- install WexInstaller.exe under ProgramFiles-->
<Directory Id="ProgramFilesFolder">
<Directory Id="MySQL" Name="MySQL">
<Directory Id="INSTALLLOCATION" Name="MySQL Universal Installer">
- <Component Id="WexInstaller.exe" Guid="AA34AE76-435A-4905-BA4B-62B61920AE2C">
- <File Id="WexInstaller.exe" Name="UnifiedInstaller.exe" KeyPath="yes" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\WexInstaller.exe">
- <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes" Name="MySQL Universal Installer" WorkingDirectory="INSTALLLOCATION" Icon="UnifiedInstaller.exe" IconIndex="0"/>
+ <Component Id="WexInstaller.exe" Guid="89A0E0A3-6E87-4C87-8F1D-6DC3D3D21CB4" Permanent="yes">
+ <File Id="WexInstaller.exe" Name="UniversalInstaller.exe" KeyPath="yes" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\WexInstaller.exe">
+ <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes" Icon="InstallerIcon.exe"
+ Name="MySQL Universal Installer" WorkingDirectory="INSTALLLOCATION"/>
</File>
+ <File Id="WexInstallerUpdater.exe" Name="WexInstallerUpdater.exe"
+ Source="$(var.ProjectDir)..\WexInstallerUpdater\bin\$(var.Configuration)\WexInstallerUpdater.exe"/>
<File Id="MySql.Data.dll" Name="MySql.Data.dll" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\mysql.data.dll"/>
+ <File Id="WexInstaller.Core.dll" Name="WexInstaller.Core.dll" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\wexinstaller.core.dll"/>
+ <File Id="StandardPlugins.dll" Name="StandardPlugins.dll" Source="$(var.ProjectDir)..\StandardPlugins\bin\$(var.Configuration)\standardplugins.dll"/>
<RemoveFolder Id="DeleteShortcutFolder1" Directory="PMCompanyDir" On="uninstall" />
<RemoveFolder Id="DeleteShortcutFolder2" Directory="ShortCutDir" On="uninstall" />
+ <Registry Action="remove" Root="HKLM"
+ Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayVersion"/>
+ </Component>
+ <Component Id="C_RemoveFiles" Guid="973F9091-5868-4D4D-A9E9-AC854D2591F3">
+ <Condition>NOT UPGRADINGPRODUCTCODE</Condition>
+ <!-- remove program files folder -->
+ <RemoveFile Id="WexInstallRemoveFiles" Directory="INSTALLLOCATION" On="uninstall" Name="*.*"/>
+ <RemoveFolder Id="WexInstallRemoveFolder" Directory="INSTALLLOCATION" On="uninstall"/>
+ <!-- remove cache folder -->
+ <RemoveFile Id="WexRemoveCacheFiles" Directory="ProductCache" On="uninstall" Name="*.*"/>
+ <RemoveFolder Id="WexRemoveCacheFolder" Directory="ProductCache" On="uninstall"/>
+ <!-- remove programdata files/folder -->
+ <RemoveFile Id="WexRemoveDataFiles" Directory="UniversalInstaller" On="uninstall" Name="*.*"/>
+ <RemoveFolder Id="WexRemoveDataFolder" Directory="UniversalInstaller" On="uninstall"/>
</Component>
</Directory>
</Directory>
@@ -35,23 +58,20 @@
</Directory>
</Directory>
- <!--
+ <!--
Install config.xml and products.xml under CommonAppDataFolder\MySQL\MySQL Universal Installer
-->
<Directory Id="CommonAppDataFolder">
<Directory Id="CommonAppDataFolder_MySQL" Name="MySQL">
- <Directory Id="UnifiedInstaller" Name="MySQL Universal Installer">
- <Component Id="ConfigFiles" Guid="314CCA77-1097-42D0-8834-B114D30CB69D">
- <File Id="config.xml" Name="config.xml" Source="..\Setup_Net\config.xml"/>
- <File Id="products.xml" Name="products.xml" Source="..\Setup_Net\products.xml"/>
- <File Id="mytemplate.ini" Name="my-template.ini" Source="..\Setup_Net\my-template.ini"/>
+ <Directory Id="UniversalInstaller" Name="MySQL Universal Installer">
+ <Component Id="ConfigFiles" Guid="">
+ <File Id="config.xml" Name="config.xml" Source="config.xml"/>
+ <File Id="products.xml" Name="products.xml.temp" Source="products.xml"/>
+ <File Id="mytemplate.ini" Name="my-template.ini" Source="my-template.ini"/>
</Component>
<Directory Id="ProductCache" Name="Product Cache">
- <Component Id="Products" Guid="1A9B9234-EFCA-4DD6-A0A0-6227871517DF">
- <CreateFolder Directory="ProductCache" />
- <util:XmlFile Id="SetProductCachePath" Action="setValue" ElementPath="//ProductCachePath" Value="[ProductCache]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="1" />
- <util:XmlFile Id="SetInstallationRoot" Action="setValue" ElementPath="//InstallationRoot" Value="[INSTALLLOCATION]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="2" />
- <util:XmlFile Id="SetProductCode" Action="setValue" ElementPath="//ProductCode" Value="[ProductCode]" File="[#config.xml]" SelectionLanguage="XPath" Sequence="3" />
+ <Component Id="Products" Guid="">
+ <CreateFolder/>
</Component>
</Directory>
</Directory>
@@ -63,25 +83,22 @@
<Feature Id="ProductFeature" Title="MySQL Universal Installer" Level="1">
<ComponentRef Id="WexInstaller.exe" />
<ComponentRef Id="ConfigFiles" />
- <ComponentRef Id="Products" />
+ <ComponentRef Id="Products"/>
+ <ComponentRef Id="C_RemoveFiles"/>
</Feature>
-
+
<PropertyRef Id="NETFRAMEWORK35"/>
<Condition Message="This application requires .NET Framework 3.5. Please install the .NET Framework then run this installer again.">
<![CDATA[Installed OR NETFRAMEWORK35]]>
</Condition>
- <Binary Id="mysqlca" SourceFile="WiX_CustomAction.dll" />
- <CustomAction Id="AutoLaunch.SetProperty1" Return="check" Property="AppPath" Value="[INSTALLLOCATION]UnifiedInstaller.exe" />
- <CustomAction Id="AutoLaunch.SetProperty2" Return="check" Property="AppArgs" Value="state=initial_install" />
- <CustomAction Id="AutoLaunch.SetProperty3" Return="check" Property="AppLoca" Value="[INSTALLLOCATION]" />
- <CustomAction Id="AutoLaunch" BinaryKey="mysqlca" DllEntry="CALaunchApp" Execute="immediate" Return="ignore" HideTarget="yes" />
+ <CustomAction Id="SetLaunchApp" Property="LaunchAppPath" Value="[#WexInstaller.exe]"/>
+ <CustomAction Id="LaunchApp" Property="LaunchAppPath" ExeCommand="" Execute="deferred" Impersonate="no" Return="asyncNoWait"/>
+
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize" />
- <Custom Action="AutoLaunch.SetProperty1" Before="AutoLaunch.SetProperty2" />
- <Custom Action="AutoLaunch.SetProperty2" Before="AutoLaunch.SetProperty3" />
- <Custom Action="AutoLaunch.SetProperty3" Before="AutoLaunch" />
- <Custom Action="AutoLaunch" After="InstallFinalize" />
+ <Custom Action="SetLaunchApp" After="PublishProduct"/>
+ <Custom Action="LaunchApp" After="SetLaunchApp">NOT INSTALLED OR UPGRADINGPRODUCTCODE</Custom>
</InstallExecuteSequence>
</Product>
=== modified file 'Setup/Setup_Net.wixproj'
--- a/Setup_Net/Setup_Net.wixproj 2011-01-31 19:39:01 +0000
+++ b/Setup/Setup_Net.wixproj 2011-02-09 23:58:01 +0000
@@ -15,11 +15,13 @@
<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>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>ProductVersion=1.0.6.0</DefineConstants>
+ <SuppressPdbOutput>True</SuppressPdbOutput>
</PropertyGroup>
<ItemGroup>
<Content Include="config.xml" />
=== renamed file 'Setup_Web/Setup_Web.wixproj' => 'Setup/Setup_Web.wixproj'
--- a/Setup_Web/Setup_Web.wixproj 2010-12-09 17:26:20 +0000
+++ b/Setup/Setup_Web.wixproj 2011-02-09 23:58:01 +0000
@@ -6,27 +6,25 @@
<ProductVersion>3.5</ProductVersion>
<ProjectGuid>{101db4cd-090c-44ce-9d19-c6ea941d2dcf}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName>mysql-universal-installer-1.0.6.0-b-web</OutputName>
+ <OutputName>mysql-universal-installer-1.0.8</OutputName>
<OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix2010.targets</WixTargetsPath>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix2010.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<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>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>ProductVersion=1.0.6.0</DefineConstants>
+ <SuppressPdbOutput>True</SuppressPdbOutput>
</PropertyGroup>
<ItemGroup>
- <Compile Include="Product.wxs" />
- <Compile Include="Product.Generated.wxs">
- <DependentUpon>Product.wxs</DependentUpon>
- <GenerateComponentGroups>True</GenerateComponentGroups>
- </Compile>
+ <Compile Include="SetupWeb.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
@@ -40,10 +38,10 @@
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<PropertyGroup>
- <PreBuildEvent>copy ..\..\..\WiX_CustomAction\Release\WiX_CustomAction.dll ..\..\obj\Release</PreBuildEvent>
+ <PreBuildEvent />
</PropertyGroup>
<PropertyGroup>
- <PostBuildEvent>del ..\..\obj\Release\WiX_CustomAction.dll</PostBuildEvent>
+ <PostBuildEvent />
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
=== renamed file 'Setup_Web/Setup_Web_vs2008.wixproj' => 'Setup/Setup_Web_vs2008.wixproj'
=== modified file 'Setup/products.xml'
--- a/Setup_Net/products.xml 2011-02-09 19:17:23 +0000
+++ b/Setup/products.xml 2011-02-09 23:58:01 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ProductManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" format="1">
- <UpdateURL>mysql-universal-installer-1.0.7.msi</UpdateURL>
- <UpdateVersion>1.0.7</UpdateVersion>
- <UpdateHash>6C759C590061C096B29C2C83C6A3C40651F5FA84</UpdateHash>
+ <UpdateURL></UpdateURL>
+ <UpdateVersion></UpdateVersion>
+ <UpdateHash></UpdateHash>
<ProductCatalogs>
<ProductCatalog id="mysql-5.5-gpl" name="MySQL 5.5" description="MySQL 5.5 Community Edition" commercial="false">
<SetupTypes>
@@ -17,7 +17,6 @@
<CatalogProduct productId="connector-odbc" setupTypeFlags="1" />
<CatalogProduct productId="connector-c" setupTypeFlags="1" />
<CatalogProduct productId="connector-cpp" setupTypeFlags="1" />
- <CatalogProduct productId="examples" setupTypeFlags="0"/>
</CatalogProducts>
</ProductCatalog>
<ProductCatalog id="mysql-5.1-gpl" name="MySQL 5.1" description="MySQL 5.1 Community Edition" commercial="false">
@@ -33,7 +32,7 @@
<CatalogProduct productId="connector-odbc" setupTypeFlags="1" />
<CatalogProduct productId="connector-c" setupTypeFlags="1" />
<CatalogProduct productId="connector-cpp" setupTypeFlags="1" />
- <CatalogProduct productId="examples" setupTypeFlags="0"/>
+ <CatalogProduct productId="examples-5.1" setupTypeFlags="0"/>
</CatalogProducts>
</ProductCatalog>
</ProductCatalogs>
@@ -140,11 +139,11 @@
</Package>
</Packages>
</Product>
- <Product name="examples" title="Examples and sample databases"
+ <Product name="examples-5.1" title="Examples and sample databases"
description="A collection of examples and sample databases to help a developer get started."
upgradeId="8C8219CB-78A4-4AF8-8D49-F36FB1FE3320" urlBaseDir="examples">
<Packages>
- <Package type="MSI" arch="X86" filename="mysql-examples-1.0.0.msi" id="{46B63307-6F7C-4E85-A77B-FA97365DF153}" thisVersion="1.0.0">
+ <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="true" hasComponents="true" />
</Package>
</Packages>
=== removed directory 'Setup_Web'
=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln 2011-02-09 14:52:59 +0000
+++ b/installer-vs2010.sln 2011-02-09 23:58:01 +0000
@@ -25,6 +25,8 @@
EndProject
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_Web", "Setup_Net\Setup_Web.wixproj", "{101DB4CD-090C-44CE-9D19-C6EA941D2DCF}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -136,6 +138,18 @@
{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|Win32.ActiveCfg = Release|Any CPU
{64664A39-D6C5-4842-A879-BDD915DDDCCF}.Release|x86.ActiveCfg = Release|Any CPU
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|Win32.ActiveCfg = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|x86.ActiveCfg = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Debug|x86.Build.0 = Debug|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|Any CPU.ActiveCfg = Release|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {101DB4CD-090C-44CE-9D19-C6EA941D2DCF}.Release|Mixed Platforms.Build.0 = Release|x86
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110209235801-r61sv80ge3ee668l.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (reggie.burnett:326) | Reggie Burnett | 10 Feb |
