#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped
269 Reggie Burnett 2011-01-28
a few simple updates
modified:
Setup_Net/Product.wxs
Setup_Net/Setup_Net.wixproj
WexInstaller/WexInstaller.csproj
installer-vs2010.sln
=== modified file 'Setup_Net/Product.wxs'
=== modified file 'Setup_Net/Product.wxs'
--- a/Setup_Net/Product.wxs 2010-12-13 19:08:38 +0000
+++ b/Setup_Net/Product.wxs 2011-01-28 21:51:06 +0000
@@ -1,30 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<?define ProductName="MySQL Universal Installer"?>
+<?define ProductVersion="1.0.6"?>
+<?define CatalogName="mysql-5.1-gpl"?>
<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" />
+ <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="no" />
</Upgrade>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
- <Icon Id="UnifiedInstaller.exe" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
+ <Icon Id="InstallerIcon" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
+ <Property Id="ARPPRODUCTICON" Value="InstallerIcon"/>
<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">
+ <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" Name="MySQL Universal Installer" WorkingDirectory="INSTALLLOCATION" Icon="UnifiedInstaller.exe" IconIndex="0"/>
+ <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes"
+ 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"/>
<RemoveFolder Id="DeleteShortcutFolder1" Directory="PMCompanyDir" On="uninstall" />
<RemoveFolder Id="DeleteShortcutFolder2" Directory="ShortCutDir" On="uninstall" />
</Component>
+ <Component Id="C_RemoveFiles" Guid="973F9091-5868-4D4D-A9E9-AC854D2591F3">
+ <Condition>NOT UPGRADINGPRODUCTCODE</Condition>
+ <RemoveFile Id="WexInstallRemoveFiles" Directory="INSTALLLOCATION" On="uninstall" Name="*.*"/>
+ <RemoveFolder Id="WexInstallRemoveFolder" Directory="INSTALLLOCATION" On="uninstall"/>
+ </Component>
</Directory>
</Directory>
</Directory>
@@ -41,22 +54,23 @@
<Directory Id="CommonAppDataFolder">
<Directory Id="CommonAppDataFolder_MySQL" Name="MySQL">
<Directory Id="UniversalInstaller" Name="MySQL Universal Installer">
- <Component Id="ConfigFiles" Guid="314CCA77-1097-42D0-8834-B114D30CB69D">
+ <Component Id="ConfigFiles" Guid="">
<File Id="config.xml" Name="config.xml" Source="config.xml"/>
- <File Id="products.xml" Name="products.xml" Source="products.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">
+ <Component Id="Products" Guid="">
<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" />
- <File Id="server" Name="mysql-5.5.7-rc-win32.msi" Source="ProductCache\mysql-5.5.7-rc-win32.msi"/>
- <File Id="workbench" Name="mysql-workbench-gpl-5.2.29-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.29-win32.msi"/>
+ <File Id="server" Name="mysql-5.1.54-win32.msi" Source="ProductCache\mysql-5.1.54-win32.msi"/>
+ <!-- <File Id="workbench" Name="mysql-workbench-gpl-5.2.29-win32.msi" Source="ProductCache\mysql-workbench-gpl-5.2.29-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="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>
@@ -69,6 +83,7 @@
<ComponentRef Id="WexInstaller.exe" />
<ComponentRef Id="ConfigFiles" />
<ComponentRef Id="Products" />
+ <ComponentRef Id="C_RemoveFiles"/>
</Feature>
<PropertyRef Id="NETFRAMEWORK35"/>
@@ -76,17 +91,12 @@
<![CDATA[Installed OR NETFRAMEWORK35]]>
</Condition>
- <Binary Id="mysqlca" SourceFile="WiX_CustomAction.dll" />
- <CustomAction Id="AutoLaunch.SetProperty1" Return="check" Property="AppPath" Value="[INSTALLLOCATION]UniversalInstaller.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="$(var.CatalogName)" 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_Net/Setup_Net.wixproj'
--- a/Setup_Net/Setup_Net.wixproj 2010-12-09 17:26:20 +0000
+++ b/Setup_Net/Setup_Net.wixproj 2011-01-28 21:51:06 +0000
@@ -8,8 +8,8 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>mysql-universal-installer-1.0.6.0-b-net</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>
=== modified file 'WexInstaller/WexInstaller.csproj'
--- a/WexInstaller/WexInstaller.csproj 2011-01-23 17:59:36 +0000
+++ b/WexInstaller/WexInstaller.csproj 2011-01-28 21:51:06 +0000
@@ -393,15 +393,6 @@
<None Include="app.manifest" />
<None Include="ClassDiagram1.cd" />
<None Include="Design.cd" />
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
=== modified file 'installer-vs2010.sln'
--- a/installer-vs2010.sln 2011-01-24 20:58:09 +0000
+++ b/installer-vs2010.sln 2011-01-28 21:51:06 +0000
@@ -12,6 +12,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WexInstallerUpdater", "WexInstallerUpdater\WexInstallerUpdater.csproj", "{A54EF986-DFDA-45BD-A901-C908C846A02B}"
EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup_Net", "Setup_Net\Setup_Net.wixproj", "{FBC6C598-EC89-49E6-8FE4-4140141761CC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,7 @@
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -33,6 +36,7 @@
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|x86.ActiveCfg = Release|Any CPU
{07B31F5A-9F17-4ACF-B3B6-2AF9000B1414}.Release|x86.Build.0 = Release|Any CPU
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Any CPU.Build.0 = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|Mixed Platforms.Build.0 = Debug|x86
{27F00801-BEAE-417F-9CF5-5686923F7538}.Debug|x86.ActiveCfg = Debug|x86
@@ -54,6 +58,7 @@
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|x86.ActiveCfg = Release|x86
{6BFB8E06-5036-4FC5-B189-14D7DBC4404F}.Release|x86.Build.0 = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Any CPU.Build.0 = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|Mixed Platforms.Build.0 = Debug|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Debug|x86.ActiveCfg = Debug|x86
@@ -63,6 +68,17 @@
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|Mixed Platforms.Build.0 = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.ActiveCfg = Release|x86
{A54EF986-DFDA-45BD-A901-C908C846A02B}.Release|x86.Build.0 = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Any CPU.Build.0 = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|x86.ActiveCfg = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Debug|x86.Build.0 = Debug|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Any CPU.ActiveCfg = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|Mixed Platforms.Build.0 = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|x86.ActiveCfg = Release|x86
+ {FBC6C598-EC89-49E6-8FE4-4140141761CC}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110128215106-1exul9fkoyyfvel7.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (reggie.burnett:269) | Reggie Burnett | 28 Jan |
