Modified:
branches/1.0/Installer/main.wxs
branches/1.0/Package.build
Log:
installer will now give a nice error if .NET 1.1 is not already on the system.
Modified: branches/1.0/Installer/main.wxs
===================================================================
--- branches/1.0/Installer/main.wxs 2007-02-15 22:22:42 UTC (rev 590)
+++ branches/1.0/Installer/main.wxs 2007-02-16 16:25:54 UTC (rev 591)
@@ -1,114 +1,118 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?define ProductVersion="1.0.9"?>
-<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
+<?xml version="1.0" encoding="utf-8"?>
+<?define ProductVersion="1.0.9"?>
+<?define ProductName="MySQL Connector Net $(var.ProductVersion)"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="D045B660-8A39-4338-8135-508B2978ABAE" 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='BinNet11' Name='.NET 1.1'/>
- <Directory Id='Mono10' Name='Mono 1.0'/>
- </Directory>
- <Directory Id='DocsDir' Name='Documentation'/>
- <Directory Id='SourceDir' Name='Source'/>
- <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="7C0533A3-E7D4-456e-A55B-773B9AC7DC67" DiskId="1">
- <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
- <?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 1.1 Binaries -->
- <DirectoryRef Id='BinNet11'>
- <Component Id="Net11" Guid="6F17833F-3CF6-4d14-8552-BBDF4014311C">
- <File Id="CoreBin11" Name="MySql.Data.dll" Source="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1" />
- <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
- Key="Software\Microsoft\VisualStudio\7.1\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)">
- <RegistryValue Id="VSRegistryValue" Value="[BinNet11]" Type="string" Action="write"/>
- </RegistryKey>
- </Component>
- <Component Id="GAC11" DiskId="1" Guid="FCD6265C-3FC9-49fe-B774-08380522711C">
- <File Id="CoreBin11GAC" Name="MySql.Data.dll" Source="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" />
- </Component>
- </DirectoryRef>
-
- <!-- Start menu junk -->
- <DirectoryRef Id='ShortCutDir'>
- <Component Id="StartMenuComponent" Guid="36FF7CFF-6239-4035-BD09-96DA9BF9467C">
- <Shortcut Id="S100" Name="Documentation"
- Description="Complete documentation for the connector"
- Target="[#CoreCHM]" Directory="ShortCutDir" />
- <Shortcut Id="S101" Name="ChangeLog"
- Description="Complete changelog for the connector" Directory="ShortCutDir"
- Icon="ChangeLogIcon" Target="[#ChangeLog]"/>
- <Shortcut Id="S102" Name="Release Notes"
- Description="Release notes" Directory="ShortCutDir" Target="[#RelNotes]"/>
- </Component>
- </DirectoryRef>
-
- <DirectoryRef Id='DocsDir'>
- <Component Id="Docs" Guid="8DB4E744-9DA0-4b19-953B-CF90390FFC74">
- <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="FeatureNet11" Level='1' Title=".NET 1.1">
- <ComponentRef Id="Net11"/>
- <ComponentRef Id="GAC11"/>
- </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_InstallDir"/>
- <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"/>
- </Product>
-</Wix>
+ <Product Id="D045B660-8A39-4338-8135-508B2978ABAE" 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 1.1 is installed -->
+ <PropertyRef Id="NETFRAMEWORK11"/>
+ <Condition Message="The .NET Framework 1.1 must be installed before installing this package.">Installed OR NETFRAMEWORK11</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='BinNet11' Name='.NET 1.1'/>
+ <Directory Id='Mono10' Name='Mono 1.0'/>
+ </Directory>
+ <Directory Id='DocsDir' Name='Documentation'/>
+ <Directory Id='SourceDir' Name='Source'/>
+ <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="7C0533A3-E7D4-456e-A55B-773B9AC7DC67" DiskId="1">
+ <File Id="ChangeLog" Name="CHANGES" Source="..\CHANGES" />
+ <?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 1.1 Binaries -->
+ <DirectoryRef Id='BinNet11'>
+ <Component Id="Net11" Guid="6F17833F-3CF6-4d14-8552-BBDF4014311C">
+ <File Id="CoreBin11" Name="MySql.Data.dll" Source="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1" />
+ <RegistryKey Id="VSRegistry" Root="HKLM" Action="createAndRemoveOnUninstall"
+ Key="Software\Microsoft\VisualStudio\7.1\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)">
+ <RegistryValue Id="VSRegistryValue" Value="[BinNet11]" Type="string" Action="write"/>
+ </RegistryKey>
+ </Component>
+ <Component Id="GAC11" DiskId="1" Guid="FCD6265C-3FC9-49fe-B774-08380522711C">
+ <File Id="CoreBin11GAC" Name="MySql.Data.dll" Source="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" />
+ </Component>
+ </DirectoryRef>
+
+ <!-- Start menu junk -->
+ <DirectoryRef Id='ShortCutDir'>
+ <Component Id="StartMenuComponent" Guid="36FF7CFF-6239-4035-BD09-96DA9BF9467C">
+ <Shortcut Id="S100" Name="Documentation"
+ Description="Complete documentation for the connector"
+ Target="[#CoreCHM]" Directory="ShortCutDir" />
+ <Shortcut Id="S101" Name="ChangeLog"
+ Description="Complete changelog for the connector" Directory="ShortCutDir"
+ Icon="ChangeLogIcon" Target="[#ChangeLog]"/>
+ <Shortcut Id="S102" Name="Release Notes"
+ Description="Release notes" Directory="ShortCutDir" Target="[#RelNotes]"/>
+ </Component>
+ </DirectoryRef>
+
+ <DirectoryRef Id='DocsDir'>
+ <Component Id="Docs" Guid="8DB4E744-9DA0-4b19-953B-CF90390FFC74">
+ <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="FeatureNet11" Level='1' Title=".NET 1.1">
+ <ComponentRef Id="Net11"/>
+ <ComponentRef Id="GAC11"/>
+ </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_InstallDir"/>
+ <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"/>
+ </Product>
+</Wix>
Modified: branches/1.0/Package.build
===================================================================
--- branches/1.0/Package.build 2007-02-15 22:22:42 UTC (rev 590)
+++ branches/1.0/Package.build 2007-02-16 16:25:54 UTC (rev 591)
@@ -91,9 +91,9 @@
<!-- 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="-ext WixNetFxExtension -sval -ext WixUIExtension -cultures:en-us main.wixobj samples.wixobj sources.wixobj -out MySql.Data.msi"/>
<zip zipfile="packages/mysql-connector-net-${ver}${postfix}.zip">
<fileset basedir="staging/Installer"><include name="MySql.Data.msi"/></fileset>
| Thread |
|---|
| • Connector/NET commit: r591 - in branches/1.0: . Installer | rburnett | 16 Feb |
