Modified:
branches/5.0/Installer/main.wxs
branches/5.0/Package.build
Log:
Installer now gives a friendly error if .NET 2.0 is not on the system first.
Modified: branches/5.0/Installer/main.wxs
===================================================================
--- branches/5.0/Installer/main.wxs 2007-02-16 16:25:54 UTC (rev 591)
+++ branches/5.0/Installer/main.wxs 2007-02-16 16:32:43 UTC (rev 592)
@@ -1,145 +1,148 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?define ProductVersion="5.0.4"?>
-<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="7394c123-cacc-4ad2-82b8-c6992131af08" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
-
- <Package Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
-
- <Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" />
-
- <!-- Our directory structure -->
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='ProgramFilesFolder' Name='PFiles'>
- <Directory Id='CompanyDir' Name='MySQL'>
- <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
- <Directory Id='Binaries' Name='Binaries'>
- <Directory Id='BinNet20' Name='.NET 2.0'/>
- <Directory Id='BinNet11' Name='.NET 1.1'/>
- <Directory Id='BinNet10' Name='.NET 1.0'/>
- <Directory Id='Mono10' Name='Mono 1.0'/>
- </Directory>
- <Directory Id='DocsDir' Name='Documentation'/>
- <Directory Id='DriverDir' Name='Driver'/>
- <Directory Id='SampleDir' Name='Samples'/>
- </Directory>
- </Directory>
- </Directory>
-
- <Directory Id="ProgramMenuFolder" Name="PMFolder">
- <Directory Id='PMCompanyDir' Name='MySQL'>
- <Directory Id="ShortCutDir" Name="$(var.ProductName)"/>
- </Directory>
- </Directory>
- </Directory>
-
- <!-- Top level junk - readme, changelog, etc -->
- <DirectoryRef Id='INSTALLDIR'>
- <Component Id="BaseComponents" Guid="6cbae281-be1e-4952-8a5d-cb5d1ad799a9" DiskId="1">
- <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
- <File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
- <?if $(var.IsGPL) = true ?>
- <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.ProductVersion)">
- <RegistryValue Id="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/>
- <RegistryValue Id="Version" Name="Version" Value="$(var.ProductVersion)" Type="string"/>
- </RegistryKey>
- </Component>
- </DirectoryRef>
-
- <!-- .Net 2.0 Binaries -->
- <DirectoryRef Id='BinNet20'>
- <Component Id="Net20" Guid="1b476514-8bcb-48a1-8b32-e477f520b450">
- <File Id="CoreBin20" Name="MySql.Data.dll"
- Source="..\Driver\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1"/>
-<!-- <File Id="CoreBin20Config" Name="CustomAction.config" Source="CustomAction.config" DiskId="1"/>-->
- <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.ProductVersion)">
- <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string" Action="write"/>
- </RegistryKey>
- </Component>
- </DirectoryRef>
-
- <!-- Start menu junk -->
- <DirectoryRef Id='ShortCutDir'>
- <Component Id="StartMenuComponent" Guid="0cd164ab-5f94-4ed3-a7aa-8bbf805a87a0">
- <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="686fbf13-83a2-4f50-a002-3378328d4740">
- <File Id="CoreCHM" Name="MySql.Data.chm" Source="..\doc\MySql.Data.chm" DiskId="1" />
- </Component>
- </DirectoryRef>
-
- <Feature Id="CoreComponents" Level="1" Title="Core Components" Description="Core Desc" Display="hidden">
- <ComponentRef Id="BaseComponents"/>
- <ComponentRef Id="StartMenuComponent"/>
- </Feature>
-
- <Feature Id="SupportedAssemblies" Level="1" Title="Supported Frameworks"
- ConfigurableDirectory="INSTALLDIR" Absent="disallow"
- Description="Frameworks that will be supported.">
- <Feature Id="FeatureNet20" Level='1' Title=".NET 2.0">
- <ComponentRef Id="Net20"/>
- </Feature>
- </Feature>
-
- <Feature Id='DocsFeature' Level='1' Title='Documentation' Description='Documentation'>
- <ComponentRef Id='Docs'/>
- </Feature>
-
- <FeatureRef Id="Samples"/>
- <FeatureRef Id="Sources"/>
-
- <Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
- <UIRef Id="WixUI_Mondo"/>
- <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
- <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
- <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
-
- <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>
- <!-- 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>
- </InstallExecuteSequence>
- </Product>
-</Wix>
-
-
-
+<?xml version="1.0" encoding="utf-8"?>
+<?define ProductVersion="5.0.4"?>
+<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product Id="7394c123-cacc-4ad2-82b8-c6992131af08" Name="$(var.ProductName)" Manufacturer="MySQL" Version="$(var.ProductVersion)" Language="1033">
+
+ <Package Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" />
+
+ <Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" />
+
+ <!-- First make sure that .NET 2.0 is installed -->
+ <PropertyRef Id="NETFRAMEWORK20"/>
+ <Condition Message="The .NET Framework 2.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20</Condition>
+
+ <!-- Our directory structure -->
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='ProgramFilesFolder' Name='PFiles'>
+ <Directory Id='CompanyDir' Name='MySQL'>
+ <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
+ <Directory Id='Binaries' Name='Binaries'>
+ <Directory Id='BinNet20' Name='.NET 2.0'/>
+ <Directory Id='BinNet11' Name='.NET 1.1'/>
+ <Directory Id='BinNet10' Name='.NET 1.0'/>
+ <Directory Id='Mono10' Name='Mono 1.0'/>
+ </Directory>
+ <Directory Id='DocsDir' Name='Documentation'/>
+ <Directory Id='DriverDir' Name='Driver'/>
+ <Directory Id='SampleDir' Name='Samples'/>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="PMFolder">
+ <Directory Id='PMCompanyDir' Name='MySQL'>
+ <Directory Id="ShortCutDir" Name="$(var.ProductName)"/>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- Top level junk - readme, changelog, etc -->
+ <DirectoryRef Id='INSTALLDIR'>
+ <Component Id="BaseComponents" Guid="6cbae281-be1e-4952-8a5d-cb5d1ad799a9" DiskId="1">
+ <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
+ <File Id="RelNotes" Name="Release Notes.txt" Source="..\Release Notes.txt" />
+ <?if $(var.IsGPL) = true ?>
+ <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.ProductVersion)">
+ <RegistryValue Id="Location" Name="Location" Value="[INSTALLDIR]" Type="string"/>
+ <RegistryValue Id="Version" Name="Version" Value="$(var.ProductVersion)" Type="string"/>
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+
+ <!-- .Net 2.0 Binaries -->
+ <DirectoryRef Id='BinNet20'>
+ <Component Id="Net20" Guid="1b476514-8bcb-48a1-8b32-e477f520b450">
+ <File Id="CoreBin20" Name="MySql.Data.dll"
+ Source="..\Driver\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1"/>
+ <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
+ Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\MySQL Connector Net $(var.ProductVersion)">
+ <RegistryValue Id="VSRegistryValue" Value="[BinNet20]" Type="string" Action="write"/>
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+
+ <!-- Start menu junk -->
+ <DirectoryRef Id='ShortCutDir'>
+ <Component Id="StartMenuComponent" Guid="0cd164ab-5f94-4ed3-a7aa-8bbf805a87a0">
+ <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="686fbf13-83a2-4f50-a002-3378328d4740">
+ <File Id="CoreCHM" Name="MySql.Data.chm" Source="..\doc\MySql.Data.chm" DiskId="1" />
+ </Component>
+ </DirectoryRef>
+
+ <Feature Id="CoreComponents" Level="1" Title="Core Components" Description="Core Desc" Display="hidden">
+ <ComponentRef Id="BaseComponents"/>
+ <ComponentRef Id="StartMenuComponent"/>
+ </Feature>
+
+ <Feature Id="SupportedAssemblies" Level="1" Title="Supported Frameworks"
+ ConfigurableDirectory="INSTALLDIR" Absent="disallow"
+ Description="Frameworks that will be supported.">
+ <Feature Id="FeatureNet20" Level='1' Title=".NET 2.0">
+ <ComponentRef Id="Net20"/>
+ </Feature>
+ </Feature>
+
+ <Feature Id='DocsFeature' Level='1' Title='Documentation' Description='Documentation'>
+ <ComponentRef Id='Docs'/>
+ </Feature>
+
+ <FeatureRef Id="Samples"/>
+ <FeatureRef Id="Sources"/>
+
+ <Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
+ <UIRef Id="WixUI_Mondo"/>
+ <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+ <WixVariable Id="WixUIBannerBmp" Value="Bitmaps/BannrBmp.bmp"/>
+ <WixVariable Id="WixUIDialogBmp" Value="Bitmaps/DlgBmp.bmp"/>
+
+ <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>
+ <!-- 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>
+ </InstallExecuteSequence>
+ </Product>
+</Wix>
+
+
+
Modified: branches/5.0/Package.build
===================================================================
--- branches/5.0/Package.build 2007-02-16 16:25:54 UTC (rev 591)
+++ branches/5.0/Package.build 2007-02-16 16:32:43 UTC (rev 592)
@@ -112,9 +112,9 @@
<target name="MakeInstaller">
<!-- now build the WIX installer -->
<exec workingdir="staging/Installer" program="candle"
- commandline="-dIsGPL=${IsGPL} -dbuild=release main.wxs samples.wxs sources.wxs"/>
+ commandline="-ext WixNetFxExtension -dIsGPL=${IsGPL} -dbuild=release main.wxs samples.wxs sources.wxs"/>
<exec workingdir="staging/Installer" program="light"
- commandline="-sval -ext WixUIExtension -cultures:en-us main.wixobj samples.wixobj sources.wixobj -out MySql.Data.msi"/>
+ commandline="-sval -ext WixNetFxExtension -ext WixUIExtension -cultures:en-us main.wixobj samples.wixobj sources.wixobj -out MySql.Data.msi"/>
</target>
<!-- verification targets -->
| Thread |
|---|
| • Connector/NET commit: r592 - in branches/5.0: . Installer | rburnett | 16 Feb |
