| List: | Commits | « Previous MessageNext Message » | |
| From: | rburnett | Date: | February 1 2007 12:04am |
| Subject: | Connector/NET commit: r574 - in branches/1.0: . Installer | ||
| View as plain text | |||
Modified: branches/1.0/Installer/main.wxs branches/1.0/Installer/samples.wxs branches/1.0/Installer/sources.wxs branches/1.0/Package.build Log: making changes to wxs files moving to WiX v3 Modified: branches/1.0/Installer/main.wxs =================================================================== --- branches/1.0/Installer/main.wxs 2007-01-30 22:38:42 UTC (rev 573) +++ branches/1.0/Installer/main.wxs 2007-01-31 23:04:06 UTC (rev 574) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <?define ProductVersion="1.0.8"?> <?define ProductName="MySQL Connector Net $(var.ProductVersion)"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> +<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 Id="????????-????-????-????-????????????" Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" /> + <Package Compressed="yes" InstallerVersion="200" Languages="1033" SummaryCodepage="1252" /> <Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" /> @@ -12,14 +12,12 @@ <Directory Id='TARGETDIR' Name='SourceDir'> <Directory Id='ProgramFilesFolder' Name='PFiles'> <Directory Id='CompanyDir' Name='MySQL'> - <Directory Id='INSTALLDIR' Name='Con$(var.ProductVersion)' LongName='$(var.ProductName)'> + <Directory Id='INSTALLDIR' Name='$(var.ProductName)'> <Directory Id='Binaries' Name='Binaries'> - <Directory Id='BinNet20' Name='NET20' LongName='.NET 2.0'/> - <Directory Id='BinNet11' Name='NET11' LongName='.NET 1.1'/> - <Directory Id='BinNet10' Name='NET10' LongName='.NET 1.0'/> - <Directory Id='Mono10' Name='MONO10' LongName='Mono 1.0'/> + <Directory Id='BinNet11' Name='.NET 1.1'/> + <Directory Id='Mono10' Name='Mono 1.0'/> </Directory> - <Directory Id='DocsDir' Name='Docs' LongName='Documentation'/> + <Directory Id='DocsDir' Name='Documentation'/> <Directory Id='SourceDir' Name='Source'/> <Directory Id='SampleDir' Name='Samples'/> </Directory> @@ -27,7 +25,7 @@ </Directory> <Directory Id="ProgramMenuFolder" Name="PMFolder"> <Directory Id='PMCompanyDir' Name='MySQL'> - <Directory Id="ShortCutDir" Name="SCutDir" LongName="$(var.ProductName)"/> + <Directory Id="ShortCutDir" Name="$(var.ProductName)"/> </Directory> </Directory> </Directory> @@ -35,10 +33,10 @@ <!-- Top level junk - readme, changelog, etc --> <DirectoryRef Id='INSTALLDIR'> <Component Id="BaseComponents" Guid="7C0533A3-E7D4-456e-A55B-773B9AC7DC67" DiskId="1"> - <File Id="ChangeLog" Name="CLog" LongName="CHANGES" src="..\CHANGES" /> + <File Id="ChangeLog" Name="CHANGES" src="..\CHANGES" /> <?if $(var.IsGPL) = true ?> - <File Id="EXCEPTIONS" Name="EXC" LongName="EXCEPTIONS" src="..\EXCEPTIONS" DiskId="1"/> - <File Id="COPYING" Name="COPY" LongName="COPYING" src="..\COPYING" DiskId="1" /> + <File Id="EXCEPTIONS" Name="EXCEPTIONS" src="..\EXCEPTIONS" DiskId="1"/> + <File Id="COPYING" Name="COPYING" src="..\COPYING" DiskId="1" /> <?endif?> <File Id="README1" Name="README" src="..\README" DiskId="1"/> <Registry Id="LocKey" Root="HKLM" Key="Software\MySQL AB\MySQL Connector/Net $(var.ProductVersion)" Name="Location" Type="string" Value="[TARGETDIR]"/> @@ -49,24 +47,24 @@ <!-- .Net 2.0 Binaries --> <DirectoryRef Id='BinNet20'> <Component Id="Net20" Guid="542ADC66-8118-4b20-816C-FC4E608ED18E"> - <File Id="CoreBin20" Name="MD20" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1" /> + <File Id="CoreBin20" Name="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" DiskId="1" /> <Registry Id="vs80registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\8.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 2.0\" /> </Component> <Component Id="GAC20" DiskId="1" Guid="53332577-9093-4319-9AD8-44EAAFF9B731"> <Condition><![CDATA[REGISTER_NET20_GAC="1"]]></Condition> - <File Id="CoreBin20GAC" Name="MD20" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" /> + <File Id="CoreBin20GAC" Name="MySql.Data.dll" src="..\mysqlclient\bin\net-2.0\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" /> </Component> </DirectoryRef> <!-- .Net 1.1 Binaries --> <DirectoryRef Id='BinNet11'> <Component Id="Net11" Guid="6F17833F-3CF6-4d14-8552-BBDF4014311C"> - <File Id="CoreBin11" Name="MD11" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1" /> + <File Id="CoreBin11" Name="MySql.Data.dll" src="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1" /> <Registry Id="vs71registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.1\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 1.1\" /> </Component> <Component Id="GAC11" DiskId="1" Guid="FCD6265C-3FC9-49fe-B774-08380522711C"> <Condition><![CDATA[REGISTER_NET11_GAC="1"]]></Condition> - <File Id="CoreBin11GAC" Name="MD11" LongName="MySql.Data.dll" src="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" /> + <File Id="CoreBin11GAC" Name="MySql.Data.dll" src="..\mysqlclient\bin\net-1.1\$(var.build)\mysql.data.dll" Assembly=".net" KeyPath="yes" /> </Component> </DirectoryRef> @@ -74,20 +72,20 @@ <DirectoryRef Id='ShortCutDir'> <Component Id="StartMenuComponent" Guid="36FF7CFF-6239-4035-BD09-96DA9BF9467C"> <Condition><![CDATA[CREATESTARTMENU="1"]]></Condition> - <Shortcut Id="S100" Name="Docs" LongName="Documentation" + <Shortcut Id="S100" Name="Documentation" Description="Complete documentation for the connector" Target="[#CoreCHM]" Directory="ShortCutDir" /> - <Shortcut Id="S101" Name="Changes" LongName="ChangeLog" + <Shortcut Id="S101" Name="ChangeLog" Description="Complete changelog for the connector" Directory="ShortCutDir" Icon="ChangeLogIcon" Target="[#ChangeLog]"/> - <Shortcut Id="S102" Name="Release" LongName="Release Notes" + <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="Docs" LongName="MySql.Data.chm" src="..\doc\MySql.Data.chm" DiskId="1" /> + <File Id="CoreCHM" Name="MySql.Data.chm" src="..\doc\MySql.Data.chm" DiskId="1" /> </Component> </DirectoryRef> Modified: branches/1.0/Installer/samples.wxs =================================================================== --- branches/1.0/Installer/samples.wxs 2007-01-30 22:38:42 UTC (rev 573) +++ branches/1.0/Installer/samples.wxs 2007-01-31 23:04:06 UTC (rev 574) @@ -1,25 +1,25 @@ <?xml version="1.0"?> -<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> - <Fragment Id='SamplesFragment'> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> +<Fragment Id='SamplesFragment'> <DirectoryRef Id='SampleDir'> - <Directory Id="TableEditor" Name="teditor" LongName="Table Editor"> + <Directory Id="TableEditor" Name="Table Editor"> <Directory Id="teCS" Name="cs"> <Component Id="Sample1CS" Guid="2EC82711-B56E-496d-9035-7BB5A2359D6F"> <File Id="teCS1" Name="App.ico" src="..\Samples\TableEditor\cs\App.ico" DiskId="1"/> - <File Id="teCS2" Name="AssInfo.cs" LongName="AssemblyInfo.cs" src="..\Samples\TableEditor\cs\AssemblyInfo.cs" DiskId="1"/> + <File Id="teCS2" Name="AssemblyInfo.cs" src="..\Samples\TableEditor\cs\AssemblyInfo.cs" DiskId="1"/> <File Id="teCS3" Name="Form1.cs" src="..\Samples\TableEditor\cs\Form1.cs" DiskId="1"/> - <File Id="teCS4" Name="Form1.res" LongName="Form1.resx" src="..\Samples\TableEditor\cs\Form1.resx" DiskId="1"/> - <File Id="teCS5" Name="te.csp" LongName="TableEditor.csproj" src="..\Samples\TableEditor\cs\TableEditor.csproj" DiskId="1"/> - <File Id="teCS7" Name="def.bld" LongName="TableEditor.build" src="..\Samples\TableEditor\cs\TableEditor.build" DiskId="1"/> + <File Id="teCS4" Name="Form1.resx" src="..\Samples\TableEditor\cs\Form1.resx" DiskId="1"/> + <File Id="teCS5" Name="TableEditor.csproj" src="..\Samples\TableEditor\cs\TableEditor.csproj" DiskId="1"/> + <File Id="teCS7" Name="TableEditor.build" src="..\Samples\TableEditor\cs\TableEditor.build" DiskId="1"/> </Component> </Directory> <Directory Id="teVB" Name="vb"> <Component Id="Sample1VB" Guid="E96D0201-7A2F-40a8-BCB7-BC23AB6910B6"> - <File Id="teVB2" Name="AssInfo.vb" LongName="AssemblyInfo.vb" src="..\Samples\TableEditor\vb\AssemblyInfo.vb" DiskId="1"/> + <File Id="teVB2" Name="AssemblyInfo.vb" src="..\Samples\TableEditor\vb\AssemblyInfo.vb" DiskId="1"/> <File Id="teVB3" Name="Form1.vb" src="..\Samples\TableEditor\vb\Form1.vb" DiskId="1"/> - <File Id="teVB4" Name="Form1.res" LongName="Form1.resx" src="..\Samples\TableEditor\vb\Form1.resx" DiskId="1"/> - <File Id="teVB5" Name="te.vbp" LongName="TableEditor.vbproj" src="..\Samples\TableEditor\vb\TableEditor.vbproj" DiskId="1"/> - <File Id="teVB7" Name="te.bld" LongName="TableEditor.build" src="..\Samples\TableEditor\vb\TableEditor.build" DiskId="1"/> + <File Id="teVB4" Name="Form1.resx" src="..\Samples\TableEditor\vb\Form1.resx" DiskId="1"/> + <File Id="teVB5" Name="TableEditor.vbproj" src="..\Samples\TableEditor\vb\TableEditor.vbproj" DiskId="1"/> + <File Id="teVB7" Name="TableEditor.build" src="..\Samples\TableEditor\vb\TableEditor.build" DiskId="1"/> </Component> </Directory> </Directory> Modified: branches/1.0/Installer/sources.wxs =================================================================== --- branches/1.0/Installer/sources.wxs 2007-01-30 22:38:42 UTC (rev 573) +++ branches/1.0/Installer/sources.wxs 2007-01-31 23:04:06 UTC (rev 574) @@ -1,142 +1,142 @@ <?xml version="1.0"?> -<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment Id='SourceFragment'> <DirectoryRef Id='SourceDir'> <Component Id="TopLevelSrc" Guid="89B34093-7D5E-42af-81A3-1B55CDD799B7"> - <File Id="nantFile" Name="client.bld" LongName="client.build" src="..\client.build" DiskId="1"/> + <File Id="nantFile" Name="client.build" src="..\client.build" DiskId="1"/> </Component> - <Directory Id="clientFolder" Name="msc" LongName="MySqlClient"> + <Directory Id="clientFolder" Name="MySqlClient"> <Component Id="ClientSrc" DiskId="1" Guid="90FFFFDF-B227-4ccd-860C-B580A49D39C3"> - <File Id="file0" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\mysqlclient\AssemblyInfo.cs" /> - <File Id="file1" Name="CHARSE_1.CS" LongName="CharSetMap.cs" src="..\mysqlclient\CharSetMap.cs" /> + <File Id="file0" Name="AssemblyInfo.cs" src="..\mysqlclient\AssemblyInfo.cs" /> + <File Id="file1" Name="CharSetMap.cs" src="..\mysqlclient\CharSetMap.cs" /> <File Id="file2" Name="command.cs" src="..\mysqlclient\command.cs" /> - <File Id="file3" Name="COMMAN_1.CS" LongName="CommandBuilder.cs" src="..\mysqlclient\CommandBuilder.cs" /> - <File Id="file4" Name="COMPRE_1.CS" LongName="CompressedStream.cs" src="..\mysqlclient\CompressedStream.cs" /> - <File Id="file5" Name="CONNEC_1.CS" LongName="Connection.cs" src="..\mysqlclient\Connection.cs" /> + <File Id="file3" Name="CommandBuilder.cs" src="..\mysqlclient\CommandBuilder.cs" /> + <File Id="file4" Name="CompressedStream.cs" src="..\mysqlclient\CompressedStream.cs" /> + <File Id="file5" Name="Connection.cs" src="..\mysqlclient\Connection.cs" /> <File Id="file6" Name="Crypt.cs" src="..\mysqlclient\Crypt.cs" /> - <File Id="file7" Name="DATAAD_1.CS" LongName="dataadapter.cs" src="..\mysqlclient\dataadapter.cs" /> - <File Id="file8" Name="DATARE_1.CS" LongName="datareader.cs" src="..\mysqlclient\datareader.cs" /> - <File Id="file9" Name="COMMAN_2.CS" LongName="CommandResult.cs" src="..\mysqlclient\CommandResult.cs"/> + <File Id="file7" Name="dataadapter.cs" src="..\mysqlclient\dataadapter.cs" /> + <File Id="file8" Name="datareader.cs" src="..\mysqlclient\datareader.cs" /> + <File Id="file9" Name="CommandResult.cs" src="..\mysqlclient\CommandResult.cs"/> <File Id="file10" Name="Driver.cs" src="..\mysqlclient\Driver.cs" /> - <File Id="file11" Name="EXCEPT_1.CS" LongName="Exception.cs" src="..\mysqlclient\Exception.cs" /> + <File Id="file11" Name="Exception.cs" src="..\mysqlclient\Exception.cs" /> <File Id="file12" Name="Field.cs" src="..\mysqlclient\Field.cs" /> - <File Id="file13" Name="CONNEC_2.CS" LongName="ConnectionString.cs" src="..\mysqlclient\ConnectionString.cs"/> - <File Id="file14" Name="PACKET_1.CS" LongName="PacketReader.cs" src="..\mysqlclient\PacketReader.cs"/> + <File Id="file13" Name="ConnectionString.cs" src="..\mysqlclient\ConnectionString.cs"/> + <File Id="file14" Name="PacketReader.cs" src="..\mysqlclient\PacketReader.cs"/> <File Id="file15" Name="Logger.cs" src="..\mysqlclient\Logger.cs" /> - <File Id="file16" Name="PACKET_2.CS" LongName="PacketWriter.cs" src="..\mysqlclient\PacketWriter.cs"/> - <File Id="file17" Name="MYSQLD_1.CSP" LongName="MySql.Data.2003.csproj" src="..\mysqlclient\MySql.Data.2003.csproj" /> - <File Id="file18" Name="MYSQLD_2.CSP" LongName="MySql.Data.2005.csproj" src="..\mysqlclient\MySql.Data.2005.csproj" /> - <File Id="file19" Name="RESOUR_2.cs" LongName="Resources.Designer.cs" src="..\mysqlclient\Resources.Designer.cs"/> - <File Id="file20" Name="MYSQLD_1.CS" LongName="MysqlDefs.cs" src="..\mysqlclient\MysqlDefs.cs" /> - <File Id="file21" Name="MYSQLE_1.CS" LongName="MySqlError.cs" src="..\mysqlclient\MySqlError.cs" /> - <File Id="file22" Name="MYSQLH_1.CS" LongName="MySqlHelper.cs" src="..\mysqlclient\MySqlHelper.cs" /> - <File Id="file23" Name="MYSQLP_1.CS" LongName="MySqlPool.cs" src="..\mysqlclient\MySqlPool.cs" /> - <File Id="file24" Name="MYSQLP_2.CS" LongName="MySqlPoolManager.cs" src="..\mysqlclient\MySqlPoolManager.cs" /> - <File Id="file26" Name="NATIVE_1.CS" LongName="NativeDriver.cs" src="..\mysqlclient\NativeDriver.cs" /> - <File Id="file27" Name="PARAME_1.CS" LongName="parameter.cs" src="..\mysqlclient\parameter.cs" /> - <File Id="file28" Name="PARAME_2.CS" LongName="parameter_collection.cs" src="..\mysqlclient\parameter_collection.cs" /> - <File Id="file30" Name="PREPAR_1.CS" LongName="PreparedStatement.cs" src="..\mysqlclient\PreparedStatement.cs" /> - <File Id="file31" Name="PROCED_1.CS" LongName="ProcedureCache.cs" src="..\mysqlclient\ProcedureCache.cs" /> - <File Id="file36" Name="RESOUR_1.RES" LongName="Resources.resx" src="..\mysqlclient\Resources.resx" /> - <File Id="file39" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\mysqlclient\StoredProcedure.cs" /> - <File Id="file40" Name="TRANSA_1.CS" LongName="transaction.cs" src="..\mysqlclient\transaction.cs" /> + <File Id="file16" Name="PacketWriter.cs" src="..\mysqlclient\PacketWriter.cs"/> + <File Id="file17" Name="MySql.Data.2003.csproj" src="..\mysqlclient\MySql.Data.2003.csproj" /> + <File Id="file18" Name="MySql.Data.2005.csproj" src="..\mysqlclient\MySql.Data.2005.csproj" /> + <File Id="file19" Name="Resources.Designer.cs" src="..\mysqlclient\Resources.Designer.cs"/> + <File Id="file20" Name="MysqlDefs.cs" src="..\mysqlclient\MysqlDefs.cs" /> + <File Id="file21" Name="MySqlError.cs" src="..\mysqlclient\MySqlError.cs" /> + <File Id="file22" Name="MySqlHelper.cs" src="..\mysqlclient\MySqlHelper.cs" /> + <File Id="file23" Name="MySqlPool.cs" src="..\mysqlclient\MySqlPool.cs" /> + <File Id="file24" Name="MySqlPoolManager.cs" src="..\mysqlclient\MySqlPoolManager.cs" /> + <File Id="file26" Name="NativeDriver.cs" src="..\mysqlclient\NativeDriver.cs" /> + <File Id="file27" Name="parameter.cs" src="..\mysqlclient\parameter.cs" /> + <File Id="file28" Name="parameter_collection.cs" src="..\mysqlclient\parameter_collection.cs" /> + <File Id="file30" Name="PreparedStatement.cs" src="..\mysqlclient\PreparedStatement.cs" /> + <File Id="file31" Name="ProcedureCache.cs" src="..\mysqlclient\ProcedureCache.cs" /> + <File Id="file36" Name="Resources.resx" src="..\mysqlclient\Resources.resx" /> + <File Id="file39" Name="StoredProcedure.cs" src="..\mysqlclient\StoredProcedure.cs" /> + <File Id="file40" Name="transaction.cs" src="..\mysqlclient\transaction.cs" /> </Component> <Directory Id="commonFolder" Name="Common"> <Component Id="CommonSrc" DiskId="1" Guid="9EC26A78-08C1-4b65-969D-F2C9C6B668DD"> - <File Id="file179" Name="CONTEX_1.CS" LongName="ContextString.cs" src="..\mysqlclient\common\ContextString.cs" /> - <File Id="file180" Name="NAMEDP_1.CS" LongName="NamedPipeStream.cs" src="..\mysqlclient\common\NamedPipeStream.cs" /> - <File Id="file181" Name="NATIVE_1.CS" LongName="NativeMethods.cs" src="..\mysqlclient\common\NativeMethods.cs" /> + <File Id="file179" Name="ContextString.cs" src="..\mysqlclient\common\ContextString.cs" /> + <File Id="file180" Name="NamedPipeStream.cs" src="..\mysqlclient\common\NamedPipeStream.cs" /> + <File Id="file181" Name="NativeMethods.cs" src="..\mysqlclient\common\NativeMethods.cs" /> <File Id="file182" Name="Platform.cs" src="..\mysqlclient\common\Platform.cs" /> - <File Id="file183" Name="DBCONN_1.CS" LongName="DBConnectionString.cs" src="..\mysqlclient\common\DBConnectionString.cs"/> - <File Id="file185" Name="SHARED_1.CS" LongName="SharedMemoryStream.cs" src="..\mysqlclient\common\SharedMemoryStream.cs" /> - <File Id="file187" Name="STREAM_1.CS" LongName="StreamCreator.cs" src="..\mysqlclient\common\StreamCreator.cs" /> + <File Id="file183" Name="DBConnectionString.cs" src="..\mysqlclient\common\DBConnectionString.cs"/> + <File Id="file185" Name="SharedMemoryStream.cs" src="..\mysqlclient\common\SharedMemoryStream.cs" /> + <File Id="file187" Name="StreamCreator.cs" src="..\mysqlclient\common\StreamCreator.cs" /> <File Id="file188" Name="Version.cs" src="..\mysqlclient\common\Version.cs" /> </Component> </Directory> <Directory Id="docSrcFolder" Name="Docs"> <Component Id="DocsSrc" DiskId="1" Guid="CBC6D91E-4E0B-47aa-9158-F394FDF27B4E"> - <File Id="file245" Name="MYSQLC_1.XML" LongName="MySqlCommand.xml" src="..\mysqlclient\docs\MySqlCommand.xml" /> - <File Id="file246" Name="MYSQLC_2.XML" LongName="MySqlCommandBuilder.xml" src="..\mysqlclient\docs\MySqlCommandBuilder.xml" /> - <File Id="file247" Name="MYSQLC_3.XML" LongName="MySqlConnection.xml" src="..\mysqlclient\docs\MySqlConnection.xml" /> - <File Id="file249" Name="MYSQLD_1.XML" LongName="MySqlDataAdapter.xml" src="..\mysqlclient\docs\MySqlDataAdapter.xml" /> - <File Id="file250" Name="MYSQLD_2.XML" LongName="MySqlDataReader.xml" src="..\mysqlclient\docs\MySqlDataReader.xml" /> - <File Id="file251" Name="MYSQLE_1.XML" LongName="MySqlException.xml" src="..\mysqlclient\docs\MySqlException.xml" /> - <File Id="file252" Name="MYSQLH_1.XML" LongName="MySqlHelper.xml" src="..\mysqlclient\docs\MySqlHelper.xml" /> - <File Id="file253" Name="MYSQLP_1.XML" LongName="MySqlParameter.xml" src="..\mysqlclient\docs\MySqlParameter.xml" /> - <File Id="file254" Name="MYSQLP_2.XML" LongName="MySqlParameterCollection.xml" src="..\mysqlclient\docs\MySqlParameterCollection.xml" /> - <File Id="file255" Name="MYSQLT_1.XML" LongName="MySqlTransaction.xml" src="..\mysqlclient\docs\MySqlTransaction.xml" /> + <File Id="file245" Name="MySqlCommand.xml" src="..\mysqlclient\docs\MySqlCommand.xml" /> + <File Id="file246" Name="MySqlCommandBuilder.xml" src="..\mysqlclient\docs\MySqlCommandBuilder.xml" /> + <File Id="file247" Name="MySqlConnection.xml" src="..\mysqlclient\docs\MySqlConnection.xml" /> + <File Id="file249" Name="MySqlDataAdapter.xml" src="..\mysqlclient\docs\MySqlDataAdapter.xml" /> + <File Id="file250" Name="MySqlDataReader.xml" src="..\mysqlclient\docs\MySqlDataReader.xml" /> + <File Id="file251" Name="MySqlException.xml" src="..\mysqlclient\docs\MySqlException.xml" /> + <File Id="file252" Name="MySqlHelper.xml" src="..\mysqlclient\docs\MySqlHelper.xml" /> + <File Id="file253" Name="MySqlParameter.xml" src="..\mysqlclient\docs\MySqlParameter.xml" /> + <File Id="file254" Name="MySqlParameterCollection.xml" src="..\mysqlclient\docs\MySqlParameterCollection.xml" /> + <File Id="file255" Name="MySqlTransaction.xml" src="..\mysqlclient\docs\MySqlTransaction.xml" /> </Component> </Directory> <Directory Id="typesFolder" Name="Types"> <Component Id="TypesSrc" DiskId="1" Guid="254E5703-D491-4d38-B42E-A2C3A9A447A5"> - <File Id="file300" Name="MYSQLB_1.CS" LongName="MySqlBinary.cs" src="..\mysqlclient\Types\MySqlBinary.cs" /> + <File Id="file300" Name="MySqlBinary.cs" src="..\mysqlclient\Types\MySqlBinary.cs" /> <File Id="file301" Name="MySqlBit.cs" src="..\mysqlclient\Types\MySqlBit.cs" /> - <File Id="file302" Name="MYSQLB_2.CS" LongName="MySqlByte.cs" src="..\mysqlclient\Types\MySqlByte.cs" /> - <File Id="file303" Name="MYSQLC_1.CS" LongName="MySqlConversionException.cs" src="..\mysqlclient\Types\MySqlConversionException.cs" /> - <File Id="file304" Name="MYSQLD_1.CS" LongName="MySqlDateTime.cs" src="..\mysqlclient\Types\MySqlDateTime.cs" /> - <File Id="file305" Name="MYSQLD_2.CS" LongName="MySqlDecimal.cs" src="..\mysqlclient\Types\MySqlDecimal.cs" /> - <File Id="file306" Name="MYSQLD_3.CS" LongName="MySqlDouble.cs" src="..\mysqlclient\Types\MySqlDouble.cs" /> - <File Id="file307" Name="MYSQLI_1.CS" LongName="MySqlInt16.cs" src="..\mysqlclient\Types\MySqlInt16.cs" /> - <File Id="file308" Name="MYSQLI_2.CS" LongName="MySqlInt32.cs" src="..\mysqlclient\Types\MySqlInt32.cs" /> - <File Id="file309" Name="MYSQLI_3.CS" LongName="MySqlInt64.cs" src="..\mysqlclient\Types\MySqlInt64.cs" /> - <File Id="file310" Name="MYSQLS_1.CS" LongName="MySqlSingle.cs" src="..\mysqlclient\Types\MySqlSingle.cs" /> - <File Id="file311" Name="MYSQLS_2.CS" LongName="MySqlString.cs" src="..\mysqlclient\Types\MySqlString.cs" /> - <File Id="file312" Name="MYSQLT_1.CS" LongName="MySqlTime.cs" src="..\mysqlclient\Types\MySqlTime.cs" /> - <File Id="file313" Name="MYSQLU_1.CS" LongName="MySqlUByte.cs" src="..\mysqlclient\Types\MySqlUByte.cs" /> - <File Id="file314" Name="MYSQLU_2.CS" LongName="MySqlUInt16.cs" src="..\mysqlclient\Types\MySqlUInt16.cs" /> - <File Id="file315" Name="MYSQLU_3.CS" LongName="MySqlUInt32.cs" src="..\mysqlclient\Types\MySqlUInt32.cs" /> - <File Id="file316" Name="MYSQLU_4.CS" LongName="MySqlUInt64.cs" src="..\mysqlclient\Types\MySqlUInt64.cs" /> - <File Id="file317" Name="MYSQLV_1.CS" LongName="MySqlValue.cs" src="..\mysqlclient\Types\MySqlValue.cs" /> + <File Id="file302" Name="MySqlByte.cs" src="..\mysqlclient\Types\MySqlByte.cs" /> + <File Id="file303" Name="MySqlConversionException.cs" src="..\mysqlclient\Types\MySqlConversionException.cs" /> + <File Id="file304" Name="MySqlDateTime.cs" src="..\mysqlclient\Types\MySqlDateTime.cs" /> + <File Id="file305" Name="MySqlDecimal.cs" src="..\mysqlclient\Types\MySqlDecimal.cs" /> + <File Id="file306" Name="MySqlDouble.cs" src="..\mysqlclient\Types\MySqlDouble.cs" /> + <File Id="file307" Name="MySqlInt16.cs" src="..\mysqlclient\Types\MySqlInt16.cs" /> + <File Id="file308" Name="MySqlInt32.cs" src="..\mysqlclient\Types\MySqlInt32.cs" /> + <File Id="file309" Name="MySqlInt64.cs" src="..\mysqlclient\Types\MySqlInt64.cs" /> + <File Id="file310" Name="MySqlSingle.cs" src="..\mysqlclient\Types\MySqlSingle.cs" /> + <File Id="file311" Name="MySqlString.cs" src="..\mysqlclient\Types\MySqlString.cs" /> + <File Id="file312" Name="MySqlTime.cs" src="..\mysqlclient\Types\MySqlTime.cs" /> + <File Id="file313" Name="MySqlUByte.cs" src="..\mysqlclient\Types\MySqlUByte.cs" /> + <File Id="file314" Name="MySqlUInt16.cs" src="..\mysqlclient\Types\MySqlUInt16.cs" /> + <File Id="file315" Name="MySqlUInt32.cs" src="..\mysqlclient\Types\MySqlUInt32.cs" /> + <File Id="file316" Name="MySqlUInt64.cs" src="..\mysqlclient\Types\MySqlUInt64.cs" /> + <File Id="file317" Name="MySqlValue.cs" src="..\mysqlclient\Types\MySqlValue.cs" /> </Component> </Directory> <Directory Id="zlibFolder" Name="zlib"> <Component Id="ZLibSrc" DiskId="1" Guid="1D292798-549F-4f3d-96DB-1CD6E4FBA181"> <File Id="file500" Name="Adler32.cs" src="..\mysqlclient\zlib\Adler32.cs" /> <File Id="file501" Name="Deflate.cs" src="..\mysqlclient\zlib\Deflate.cs" /> - <File Id="file502" Name="InfBlo_1.cs" LongName="InfBlocks.cs" src="..\mysqlclient\zlib\InfBlocks.cs" /> + <File Id="file502" Name="InfBlocks.cs" src="..\mysqlclient\zlib\InfBlocks.cs" /> <File Id="file503" Name="InfCodes.cs" src="..\mysqlclient\zlib\InfCodes.cs" /> <File Id="file504" Name="Inflate.cs" src="..\mysqlclient\zlib\Inflate.cs" /> <File Id="file505" Name="InfTree.cs" src="..\mysqlclient\zlib\InfTree.cs" /> - <File Id="file506" Name="Static_1.cs" LongName="StaticTree.cs" src="..\mysqlclient\zlib\StaticTree.cs" /> - <File Id="file507" Name="Suppor_1.cs" LongName="SupportClass.cs" src="..\mysqlclient\zlib\SupportClass.cs" /> + <File Id="file506" Name="StaticTree.cs" src="..\mysqlclient\zlib\StaticTree.cs" /> + <File Id="file507" Name="SupportClass.cs" src="..\mysqlclient\zlib\SupportClass.cs" /> <File Id="file508" Name="Tree.cs" src="..\mysqlclient\zlib\Tree.cs" /> - <File Id="file509" Name="ZInput_1.cs" LongName="ZInputStream.cs" src="..\mysqlclient\zlib\ZInputStream.cs" /> + <File Id="file509" Name="ZInputStream.cs" src="..\mysqlclient\zlib\ZInputStream.cs" /> <File Id="file510" Name="Zlib.cs" src="..\mysqlclient\zlib\Zlib.cs" /> - <File Id="file511" Name="ZOutpu_1.cs" LongName="ZOutputStream.cs" src="..\mysqlclient\zlib\ZOutputStream.cs" /> + <File Id="file511" Name="ZOutputStream.cs" src="..\mysqlclient\zlib\ZOutputStream.cs" /> <File Id="file512" Name="ZStream.cs" src="..\mysqlclient\zlib\ZStream.cs" /> - <File Id="file513" Name="ZStrea_1.cs" LongName="ZStreamException.cs" src="..\mysqlclient\zlib\ZStreamException.cs" /> + <File Id="file513" Name="ZStreamException.cs" src="..\mysqlclient\zlib\ZStreamException.cs" /> </Component> </Directory> </Directory> - <Directory Id="TestSuite" Name="ts" LongName="TestSuite"> + <Directory Id="TestSuite" Name="TestSuite"> <Component Id="TestSuiteSrc" DiskId="1" Guid="E9B23A6A-9B6C-48c0-8D25-7CB6C5D0C229"> - <File Id="file400" Name="APP_1.CON" LongName="App.config" src="..\TestSuite\App.config" /> - <File Id="file401" Name="ASSEMB_1.CS" LongName="AssemblyInfo.cs" src="..\TestSuite\AssemblyInfo.cs" /> + <File Id="file400" Name="App.config" src="..\TestSuite\App.config" /> + <File Id="file401" Name="AssemblyInfo.cs" src="..\TestSuite\AssemblyInfo.cs" /> <File Id="file403" Name="BaseTest.cs" src="..\TestSuite\BaseTest.cs" /> - <File Id="file404" Name="BLOBTE_1.CS" LongName="BlobTests.cs" src="..\TestSuite\BlobTests.cs" /> - <File Id="file405" Name="CHARAC_1.CS" LongName="CharacterSetTests.cs" src="..\TestSuite\CharacterSetTests.cs" /> - <File Id="file406" Name="COMMAN_1.CS" LongName="CommandBuilderTests.cs" src="..\TestSuite\CommandBuilderTests.cs" /> - <File Id="file407" Name="COMMAN_2.CS" LongName="CommandTests.cs" src="..\TestSuite\CommandTests.cs" /> - <File Id="file408" Name="CONNEC_1.CS" LongName="ConnectionTests.cs" src="..\TestSuite\ConnectionTests.cs" /> - <File Id="file409" Name="CULTUR_1.CS" LongName="CultureTests.cs" src="..\TestSuite\CultureTests.cs" /> - <File Id="file411" Name="DATAAD_1.CS" LongName="DataAdapterTests.cs" src="..\TestSuite\DataAdapterTests.cs" /> - <File Id="file412" Name="DATARE_1.CS" LongName="DataReaderTests.cs" src="..\TestSuite\DataReaderTests.cs" /> - <File Id="file414" Name="DATATY_1.CS" LongName="DataTypeTests.cs" src="..\TestSuite\DataTypeTests.cs" /> - <File Id="file415" Name="DATETI_1.CS" LongName="DateTimeTests.cs" src="..\TestSuite\DateTimeTests.cs" /> - <File Id="file416" Name="EVENTT_1.CS" LongName="EventTests.cs" src="..\TestSuite\EventTests.cs" /> - <File Id="file417" Name="EXCEPT_1.CS" LongName="Exceptions.cs" src="..\TestSuite\Exceptions.cs" /> - <File Id="file422" Name="LANGUA_1.CS" LongName="LanguageTests.cs" src="..\TestSuite\LanguageTests.cs" /> - <File Id="file427" Name="MYSQLD_1.CSP" LongName="MySql.Data.Tests.2003.csproj" src="..\TestSuite\MySql.Data.Tests.2003.csproj" /> - <File Id="file428" Name="MYSQLD_2.CSP" LongName="MySql.Data.Tests.2005.csproj" src="..\TestSuite\MySql.Data.Tests.2005.csproj" /> - <File Id="file430" Name="MYSQLH_1.CS" LongName="MySqlHelperTests.cs" src="..\TestSuite\MySqlHelperTests.cs" /> - <File Id="file431" Name="PARAME_1.CS" LongName="ParameterTests.cs" src="..\TestSuite\ParameterTests.cs" /> - <File Id="file433" Name="POOLIN_1.CS" LongName="PoolingTests.cs" src="..\TestSuite\PoolingTests.cs" /> - <File Id="file434" Name="PREPAR_1.CS" LongName="PreparedStatements.cs" src="..\TestSuite\PreparedStatements.cs" /> - <File Id="file435" Name="STORED_1.CS" LongName="StoredProcedure.cs" src="..\TestSuite\StoredProcedure.cs" /> - <File Id="file436" Name="STRESS_1.CS" LongName="StressTests.cs" src="..\TestSuite\StressTests.cs" /> + <File Id="file404" Name="BlobTests.cs" src="..\TestSuite\BlobTests.cs" /> + <File Id="file405" Name="CharacterSetTests.cs" src="..\TestSuite\CharacterSetTests.cs" /> + <File Id="file406" Name="CommandBuilderTests.cs" src="..\TestSuite\CommandBuilderTests.cs" /> + <File Id="file407" Name="CommandTests.cs" src="..\TestSuite\CommandTests.cs" /> + <File Id="file408" Name="ConnectionTests.cs" src="..\TestSuite\ConnectionTests.cs" /> + <File Id="file409" Name="CultureTests.cs" src="..\TestSuite\CultureTests.cs" /> + <File Id="file411" Name="DataAdapterTests.cs" src="..\TestSuite\DataAdapterTests.cs" /> + <File Id="file412" Name="DataReaderTests.cs" src="..\TestSuite\DataReaderTests.cs" /> + <File Id="file414" Name="DataTypeTests.cs" src="..\TestSuite\DataTypeTests.cs" /> + <File Id="file415" Name="DateTimeTests.cs" src="..\TestSuite\DateTimeTests.cs" /> + <File Id="file416" Name="EventTests.cs" src="..\TestSuite\EventTests.cs" /> + <File Id="file417" Name="Exceptions.cs" src="..\TestSuite\Exceptions.cs" /> + <File Id="file422" Name="LanguageTests.cs" src="..\TestSuite\LanguageTests.cs" /> + <File Id="file427" Name="MySql.Data.Tests.2003.csproj" src="..\TestSuite\MySql.Data.Tests.2003.csproj" /> + <File Id="file428" Name="MySql.Data.Tests.2005.csproj" src="..\TestSuite\MySql.Data.Tests.2005.csproj" /> + <File Id="file430" Name="MySqlHelperTests.cs" src="..\TestSuite\MySqlHelperTests.cs" /> + <File Id="file431" Name="ParameterTests.cs" src="..\TestSuite\ParameterTests.cs" /> + <File Id="file433" Name="PoolingTests.cs" src="..\TestSuite\PoolingTests.cs" /> + <File Id="file434" Name="PreparedStatements.cs" src="..\TestSuite\PreparedStatements.cs" /> + <File Id="file435" Name="StoredProcedure.cs" src="..\TestSuite\StoredProcedure.cs" /> + <File Id="file436" Name="StressTests.cs" src="..\TestSuite\StressTests.cs" /> <File Id="file437" Name="Syntax.cs" src="..\TestSuite\Syntax.cs" /> - <File Id="file438" Name="THREAD_1.CS" LongName="Threading.cs" src="..\TestSuite\Threading.cs" /> - <File Id="file439" Name="Simple_1.CS" LongName="SimpleTransactions.cs" src="..\TestSuite\SimpleTransactions.cs" /> + <File Id="file438" Name="Threading.cs" src="..\TestSuite\Threading.cs" /> + <File Id="file439" Name="SimpleTransactions.cs" src="..\TestSuite\SimpleTransactions.cs" /> <File Id="file441" Name="Utils.cs" src="..\TestSuite\Utils.cs" /> </Component> </Directory> Modified: branches/1.0/Package.build =================================================================== --- branches/1.0/Package.build 2007-01-30 22:38:42 UTC (rev 573) +++ branches/1.0/Package.build 2007-01-31 23:04:06 UTC (rev 574) @@ -90,12 +90,10 @@ <nant buildfile="staging/client.build" target="allframeworks"/> <!-- now build the WIX installer --> - <exec workingdir="staging/Installer" program="candle" commandline="-dIsGPL=${IsGPL} -dbuild=release main.wxs"/> - <exec workingdir="staging/Installer" program="candle" commandline="samples.wxs"/> - <exec workingdir="staging/Installer" program="candle" commandline="sources.wxs"/> - <exec workingdir="staging/Installer" program="candle" commandline="custom.wxs"/> - <exec workingdir="staging/Installer" program="light" - commandline='main.wixobj samples.wixobj sources.wixobj custom.wixobj "${wix.dir}/WixUI.wixlib" -loc "${wix.dir}/WixUI_en-us.wxl" -out MySql.Data.msi'/> + <exec workingdir="staging/Installer" program="candle" + commandline="-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"/> <zip zipfile="packages/mysql-connector-net-${ver}${postfix}.zip"> <fileset basedir="staging/Installer"><include name="MySql.Data.msi"/></fileset>
| Thread | ||
|---|---|---|
| • Connector/NET commit: r574 - in branches/1.0: . Installer | rburnett | 31 Jan |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.749 sec. using MySQL 5.1.14-beta-log