Added:
branches/5.1/Installer/core.wxs
Modified:
branches/5.1/Installer/main.wxs
branches/5.1/Installer/webproviders.wxs
Log:
Cleaned up some items with our Wix installer
Added: branches/5.1/Installer/core.wxs
===================================================================
--- branches/5.1/Installer/core.wxs 2007-08-31 22:08:45 UTC (rev 999)
+++ branches/5.1/Installer/core.wxs 2007-09-10 20:06:19 UTC (rev 1000)
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment Id='CoreFragment'>
+
+ <!-- Top level junk - readme, changelog, etc -->
+ <DirectoryRef Id='INSTALLDIR'>
+ <Component Id="BaseFiles" Guid="2448b1b1-f2ec-4153-96c6-bcaae7692ef9" DiskId="1">
+ <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
+ <File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
+ <?if $(var.IsGPL) = 1 ?>
+ <File Id="EXCEPTIONS" Name="EXCEPTIONS" Source="..\EXCEPTIONS" DiskId="1"/>
+ <File Id="COPYING" Name="COPYING" Source="..\COPYING" DiskId="1" />
+ <?endif?>
+ <File Id="README1" Name="README" Source="..\README" DiskId="1"/>
+ <RegistryKey Id="MySqlKey" Root="HKLM" Action="createAndRemoveOnUninstall"
+ Key="Software\MySQL AB\MySQL Connector/Net $(var.Version)">
+ <RegistryValue Id="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/>
+ <RegistryValue Id="Version" Name="Version" Value="$(var.Version)" Type="string"/>
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+
+ <!-- .Net 2.0 Binaries -->
+ <DirectoryRef Id='BinNet20'>
+ <Component Id="Net20" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
+ <File Id="MySqlData" Name="MySql.Data.dll"
+ Source="..\Driver\bin\net-2.0\release\mysql.data.dll" DiskId="1"/>
+ <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
+ Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
+ <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string" Action="write"/>
+ </RegistryKey>
+ </Component>
+ <Directory Id="MySql.Data.DummyDir" Name="GAC">
+ <Component Id="GAC20" Guid="58f70e4a-96f7-4b67-bdab-9b77a60f9c09">
+ <File Id="MySql.Data.GAC" Name="MySql.Data.dll"
+ Source="..\Driver\bin\net-2.0\release\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+
+ <!-- Start menu junk -->
+ <DirectoryRef Id='ShortCutDir'>
+ <Component Id="StartMenuComponent" Guid="31e1c7c6-e06d-4214-82ca-58e67e5232e2">
+ <CreateFolder/> <!-- Clear ICE18 error -->
+ <Shortcut Id="S100" Name="Documentation" Description="Complete documentation for the connector"
+ Target="[DocsDir]/MySql.Data.chm" Directory="ShortCutDir" />
+ <Shortcut Id="S101" Name="ChangeLog" Description="Complete changelog for the connector"
+ Directory="ShortCutDir" Icon="ChangeLogIcon" Target="[INSTALLDIR]/CHANGES"/>
+ <Shortcut Id="S102" Name="Release Notes" Description="Release notes"
+ Directory="ShortCutDir" Target="[INSTALLDIR]/Release Notes.txt"/>
+ </Component>
+ </DirectoryRef>
+
+ <Feature Id="Core.Feature" Level="1" Title="Core Components" Description="Core Components"
+ ConfigurableDirectory ="INSTALLDIR" Absent="disallow" Display="2">
+ <ComponentRef Id="BaseFiles"/>
+ <ComponentRef Id="Net20"/>
+ <ComponentRef Id="GAC20"/>
+ <ComponentRef Id="StartMenuComponent"/>
+ </Feature>
+
+ <CustomAction Id="MySqlData.Install.CheckFX" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" />
+ <CustomAction Id="MySqlData.Install.SetProperty" Property="MySqlData.Install"
+ Value='/installtype=notransaction /action=install /LogFile= "[#MySqlData]" "[VSDFxConfigFile]"'/>
+ <CustomAction Id="MySqlData.Install" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
+
+ <CustomAction Id="MySqlData.Remove.CheckFX" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" />
+ <CustomAction Id="MySqlData.Remove.SetProperty" Property="MySqlData.Remove"
+ Value='/installtype=notransaction /action=uninstall /LogFile= "[#MySqlData]" "[VSDFxConfigFile]"'/>
+ <CustomAction Id="MySqlData.Remove" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
+
+ <InstallExecuteSequence>
+ <Custom Action="MySqlData.Install.CheckFX" After="InstallFiles">NOT Installed</Custom>
+ <Custom Action="MySqlData.Install.SetProperty" After="MySqlData.Install.CheckFX">NOT Installed</Custom>
+ <Custom Action="MySqlData.Install" After="MySqlData.Install.SetProperty">NOT Installed</Custom>
+
+ <Custom Action="MySqlData.Remove.CheckFX" Before="RemoveFiles">Installed</Custom>
+ <Custom Action="MySqlData.Remove.SetProperty" After="MySqlData.Remove.CheckFX">Installed</Custom>
+ <Custom Action="MySqlData.Remove" After="MySqlData.Remove.SetProperty">Installed</Custom>
+ </InstallExecuteSequence>
+ </Fragment>
+</Wix>
+
+
Modified: branches/5.1/Installer/main.wxs
===================================================================
--- branches/5.1/Installer/main.wxs 2007-08-31 22:08:45 UTC (rev 999)
+++ branches/5.1/Installer/main.wxs 2007-09-10 20:06:19 UTC (rev 1000)
@@ -40,52 +40,6 @@
</Directory>
</Directory>
- <!-- Top level junk - readme, changelog, etc -->
- <DirectoryRef Id='INSTALLDIR'>
- <Component Id="BaseComponents" Guid="2448b1b1-f2ec-4153-96c6-bcaae7692ef9" DiskId="1">
- <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
- <File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
- <?if $(var.IsGPL) = 1 ?>
- <File Id="EXCEPTIONS" Name="EXCEPTIONS" Source="..\EXCEPTIONS" DiskId="1"/>
- <File Id="COPYING" Name="COPYING" Source="..\COPYING" DiskId="1" />
- <?endif?>
- <File Id="README1" Name="README" Source="..\README" DiskId="1"/>
- <RegistryKey Id="MySqlKey" Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="Software\MySQL AB\MySQL Connector/Net $(var.Version)">
- <RegistryValue Id="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/>
- <RegistryValue Id="Version" Name="Version" Value="$(var.Version)" Type="string"/>
- </RegistryKey>
- </Component>
- </DirectoryRef>
-
- <!-- .Net 2.0 Binaries -->
- <DirectoryRef Id='BinNet20'>
- <Component Id="Net20" Guid="0e8af006-273c-49bb-b7c1-ec1737260a5a">
- <File Id="CoreBin20" Name="MySql.Data.dll"
- Source="..\Driver\bin\net-2.0\release\mysql.data.dll" DiskId="1"/>
- <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.Version)">
- <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string" Action="write"/>
- </RegistryKey>
- </Component>
- <Component Id="GAC20" Guid="58f70e4a-96f7-4b67-bdab-9b77a60f9c09">
- <File Id="GAC20" Name="MySql.Data.dll"
- Source="..\Driver\bin\net-2.0\release\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
- </Component>
- </DirectoryRef>
-
- <!-- Start menu junk -->
- <DirectoryRef Id='ShortCutDir'>
- <Component Id="StartMenuComponent" Guid="31e1c7c6-e06d-4214-82ca-58e67e5232e2">
- <Shortcut Id="S100" Name="Documentation" Description="Complete documentation for the connector"
- Target="[DocsDir]/MySql.Data.chm" Directory="ShortCutDir" />
- <Shortcut Id="S101" Name="ChangeLog" Description="Complete changelog for the connector"
- Directory="ShortCutDir" Icon="ChangeLogIcon" Target="[INSTALLDIR]/CHANGES"/>
- <Shortcut Id="S102" Name="Release Notes" Description="Release notes"
- Directory="ShortCutDir" Target="[INSTALLDIR]/Release Notes.txt"/>
- </Component>
- </DirectoryRef>
-
<DirectoryRef Id='DocsDir'>
<Component Id="Docs" Guid="8f9d25c7-1eba-4391-b764-eb1f7d39243e">
<File Id="CoreCHM" Name="MySql.Data.chm" Source="..\Documentation\Output\MySql.Data.chm" DiskId="1" />
@@ -95,14 +49,6 @@
<Merge Id='VSIPREG' Language='0' DiskId='1' SourceFile='Binary\VSIPCC_Collection_Files_RTL_---_---.msm'/>
</DirectoryRef>
- <Feature Id="CoreComponents" Level="1" Title="Core Components" Description="Core Components"
- ConfigurableDirectory ="INSTALLDIR" Absent="disallow" Display="2">
- <ComponentRef Id="BaseComponents"/>
- <ComponentRef Id="Net20"/>
- <ComponentRef Id="GAC20"/>
- <ComponentRef Id="StartMenuComponent"/>
- </Feature>
-
<Feature Id='DocsFeature' Display='4' Level='1' Title='Documentation' Description='Documentation'>
<ComponentRef Id='Docs'/>
<MergeRef Id='HELP'/>
@@ -110,11 +56,15 @@
<MergeRef Id='VSIPREG'/>
</Feature>
+ <FeatureRef Id='Core.Feature'/>
<FeatureRef Id="Samples"/>
<FeatureRef Id="WebProviders"/>
<FeatureRef Id="VisualStudio"/>
<FeatureRef Id="CompactFramework"/>
-
+
+ <Binary Id="InstallUtil" SourceFile="Binary\InstallUtilLib.dll" />
+ <Binary Id="MSVBDPCADLL" SourceFile="Binary\MSVBDPCADLL.ibd" />
+ <Binary Id="VSDNETCFG" SourceFile="Binary\VSDNETCFG.ibd" />
<Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
<!-- Remove the license agreement dialog -->
<UIRef Id="WixUI_MySQL"/>
@@ -123,43 +73,9 @@
<Icon Id="ChangeLogIcon" SourceFile="Bitmaps\document.ico"/>
- <!-- custom actions for machine.config mods -->
- <Binary Id="InstallUtil" SourceFile="Binary\InstallUtilLib.dll" />
- <Binary Id="MSVBDPCADLL" SourceFile="Binary\MSVBDPCADLL.ibd" />
- <Binary Id="VSDNETCFG" SourceFile="Binary\VSDNETCFG.ibd" />
-
- <CustomAction Id="SetPrereqs" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no" />
- <CustomAction Id="MyCASetProp" Property="InstallCA" Impersonate="no"
- Value="/installtype=notransaction /action=install /LogFile= "[#CoreBin20]" "[VSDFxConfigFile]""/>
- <CustomAction Id="InstallCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall"
- Execute="deferred" Impersonate="no"/>
-
- <CustomAction Id="SetPrereqs1" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no"/>
- <CustomAction Id="MyCAUnSetProp" Property="RemoveCA" Impersonate="no"
- Value="/installtype=notransaction /action=uninstall /LogFile= "[#CoreBin20]" "[VSDFxConfigFile]""/>
- <CustomAction Id="RemoveCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall"
- Execute="deferred" Impersonate="no" />
-
<InstallExecuteSequence>
- <ProcessComponents Sequence="2600" />
- <UnpublishComponents Sequence="2700" />
- <UnpublishFeatures Sequence="2800" />
- <StopServices Sequence="2900" />
- <RegisterComPlus Sequence="6700" />
- <CreateShortcuts Sequence="7590" />
- <InstallFinalize Sequence="7800" />
-
- <!-- Install code -->
- <Custom Action="SetPrereqs" After="InstallFiles"/>
- <Custom Action="MyCASetProp" After="SetPrereqs">NOT Installed</Custom>
- <Custom Action="InstallCA" After="MyCASetProp">NOT Installed</Custom>
-
- <!-- UnInstall code -->
- <Custom Action="SetPrereqs1" Before="RemoveFiles">Installed</Custom>
- <Custom Action="MyCAUnSetProp" After="SetPrereqs1">Installed</Custom>
- <Custom Action="RemoveCA" After="MyCAUnSetProp">Installed</Custom>
+ <InstallFinalize Sequence="7800"/>
</InstallExecuteSequence>
-
</Product>
</Wix>
Modified: branches/5.1/Installer/webproviders.wxs
===================================================================
--- branches/5.1/Installer/webproviders.wxs 2007-08-31 22:08:45 UTC (rev 999)
+++ branches/5.1/Installer/webproviders.wxs 2007-09-10 20:06:19 UTC (rev 1000)
@@ -3,12 +3,14 @@
<Fragment Id='ProvidersFragment'>
<DirectoryRef Id='INSTALLDIR'>
<Directory Id='WPDir' Name='Web Providers'>
- <Component Id="ProvidersGAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
- <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"
- Source="..\MySql.Web\providers\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
- </Component>
+ <Directory Id="MySql.Web.DummyDir" Name="GAC">
+ <Component Id="ProvidersGAC" Guid="6b95d34b-91e1-41ff-9f3f-dcb5308a00ce">
+ <File Id="ProviderAssemblyGAC" Name="MySql.Web.dll" ShortName="MW"
+ Source="..\MySql.Web\providers\bin\release\mysql.web.dll" DiskId="1" Assembly=".net" KeyPath="yes"/>
+ </Component>
+ </Directory>
<Component Id="Providers" Guid="8578813e-e123-45ad-9c92-565382a058b6">
- <File Id="ProviderAssembly" Name="MySql.Web.dll" DiskId="1"
+ <File Id="MySqlWeb" Name="MySql.Web.dll" DiskId="1"
Source="..\MySql.Web\providers\bin\release\mysql.web.dll"/>
</Component>
</Directory>
@@ -20,30 +22,27 @@
<ComponentRef Id='ProvidersGAC'/>
</Feature>
- <CustomAction Id="WPSetPrereqs" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no" />
- <CustomAction Id="WPCASetProp" Property="WPInstallCA" Impersonate="no"
- Value="/installtype=notransaction /action=install /LogFile= "[#ProviderAssembly]" "[VSDFxConfigFile]""/>
- <CustomAction Id="WPInstallCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall"
- Execute="deferred" Impersonate="no"/>
+ <CustomAction Id="MySqlWeb.Install.CheckFX" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" />
+ <CustomAction Id="MySqlWeb.Install.SetProperty" Property="MySqlWeb.Install"
+ Value='/installtype=notransaction /action=install /LogFile= "[#MySqlWeb]" "[VSDFxConfigFile]"'/>
+ <CustomAction Id="MySqlWeb.Install" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
- <CustomAction Id="WPSetPrereqs1" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" Impersonate="no"/>
- <CustomAction Id="WPCAUnSetProp" Property="WPRemoveCA" Impersonate="no"
- Value="/installtype=notransaction /action=uninstall /LogFile= "[#ProviderAssembly]" "[VSDFxConfigFile]""/>
- <CustomAction Id="WPRemoveCA" BinaryKey="InstallUtil" DllEntry="ManagedInstall"
- Execute="deferred" Impersonate="no" />
+ <CustomAction Id="MySqlWeb.Remove.CheckFX" BinaryKey="MSVBDPCADLL" DllEntry="CheckFX" />
+ <CustomAction Id="MySqlWeb.Remove.SetProperty" Property="MySqlWeb.Remove"
+ Value='/installtype=notransaction /action=uninstall /LogFile= "[#MySqlWeb]" "[VSDFxConfigFile]"'/>
+ <CustomAction Id="MySqlWeb.Remove" BinaryKey="InstallUtil" DllEntry="ManagedInstall" Execute="deferred" />
<InstallExecuteSequence>
- <!-- Install code -->
- <Custom Action="WPSetPrereqs" After="InstallFiles"><![CDATA[ $Providers > 2 ]]></Custom>
- <Custom Action="WPCASetProp" After="WPSetPrereqs"><![CDATA[ $Providers > 2 ]]></Custom>
- <Custom Action="WPInstallCA" After="WPCASetProp"><![CDATA[ $Providers > 2 ]]></Custom>
+ <!-- Register code -->
+ <Custom Action="MySqlWeb.Install.CheckFX" After="InstallFiles">$Providers > 2</Custom>
+ <Custom Action="MySqlWeb.Install.SetProperty" After="MySqlWeb.Install.CheckFX">$Providers > 2</Custom>
+ <Custom Action="MySqlWeb.Install" After="MySqlWeb.Install.SetProperty">$Providers > 2</Custom>
- <!-- UnInstall code -->
- <Custom Action="WPSetPrereqs1" Before="RemoveFiles"><![CDATA[ $Providers = 2 ]]></Custom>
- <Custom Action="WPCAUnSetProp" After="WPSetPrereqs1"><![CDATA[ $Providers = 2 ]]></Custom>
- <Custom Action="WPRemoveCA" After="WPCAUnSetProp"><![CDATA[ $Providers = 2 ]]></Custom>
+ <!-- Unregister code -->
+ <Custom Action="MySqlWeb.Remove.CheckFX" After="InstallFiles">$Providers = 2</Custom>
+ <Custom Action="MySqlWeb.Remove.SetProperty" After="MySqlWeb.Install.CheckFX">$Providers = 2</Custom>
+ <Custom Action="MySqlWeb.Remove" After="MySqlWeb.Remove.SetProperty">$Providers = 2</Custom>
</InstallExecuteSequence>
-
</Fragment>
</Wix>
| Thread |
|---|
| • Connector/NET commit: r1000 - branches/5.1/Installer | rburnett | 10 Sep |
