Modified:
branches/1.0/Client.build
branches/1.0/Installer/main.wxs
Log:
Client.build - adjusted how mono is build and tested.
main.wxs - updated the vs registry keys. added Mono build
Modified: branches/1.0/Client.build
===================================================================
--- branches/1.0/Client.build 2005-09-23 16:20:40 UTC (rev 182)
+++ branches/1.0/Client.build 2005-09-27 02:29:23 UTC (rev 183)
@@ -3,8 +3,7 @@
<property name="ncover.executable" value="c:\program files\ncover\ncover.console.exe"/>
<property name="fxcop.executable" value="c:\program files\fxcop\fxcopcmd.exe"/>
- <property name="nunit-net" value="C:\Program Files\NUnit 2.2.2\bin" />
- <property name="nunit-mono" value="c:\program files\NUnit-Mono 2.2\bin" />
+ <property name="nunit" value="C:\Program Files\NUnit 2.2.2" />
<!-- filesets -->
<fileset id="Source">
@@ -35,7 +34,7 @@
</if>
<!-- builds the client on all supported frameworks -->
- <target name="allframeworks" depends="net-1.0, net-1.1, net-2.0, mono-1.0">
+ <target name="allframeworks" depends="net-1.0, net-1.1, mono-1.0">
<call target="Docs"/>
</target>
@@ -69,58 +68,54 @@
<include name="${outdir}/MySql.Data.dll"/>
<include name="System.Data.dll"/>
<include name="System.Drawing.dll"/>
- <include name="${nunit}/nunit.framework.dll"/>
+ <include name="${nunit-lib}/nunit.framework.dll"/>
</references>
</csc>
</target>
<!-- core managed driver target 1.0 -->
<target name="net-1.0" description="1.0 .NET target">
- <property name="nunit" value="${nunit-net}"/>
+ <property name="nunit-lib" value="${nunit}/bin"/>
<property name="framework" value="net-1.0"/>
<call target="client"/>
</target>
<!-- core managed driver target 1.1 -->
<target name="net-1.1" description="1.1 .NET target">
- <property name="nunit" value="${nunit-net}"/>
+ <property name="nunit-lib" value="${nunit}/bin"/>
<property name="framework" value="net-1.1"/>
<call target="client"/>
</target>
<!-- core managed driver target 2.0 -->
<target name="net-2.0" description="2.0 .NET target">
- <property name="nunit" value="${nunit-net}"/>
<property name="framework" value="net-2.0"/>
<call target="client"/>
</target>
<!-- core managed driver target mono 1.0 -->
<target name="mono-1.0" description="Mono 1.0 Target">
- <property name="nunit" value="${nunit-mono}"/>
+ <property name="nunit-lib" value="${framework::get-assembly-directory('mono-1.0')}"/>
<property name="framework" value="mono-1.0"/>
<call target="client"/>
</target>
<!-- testing targets -->
- <target name="alltests" depends="test-net-2.0, test-net-1.1, test-net-1.0">
+ <target name="alltests" depends="test-net-1.1, test-net-1.0">
</target>
<target name="test-net-1.1" depends="net-1.1">
- <property name="nunit" value="${nunit-net}"/>
<property name="framework" value="net-1.1"/>
<call target="testclient"/>
<call target="fxcop"/>
</target>
<target name="test-net-2.0" depends="net-2.0">
- <property name="nunit" value="${nunit-net}"/>
<property name="framework" value="net-2.0"/>
<call target="testclient"/>
</target>
<target name="test-net-1.0" depends="net-1.0">
- <property name="nunit" value="${nunit-net}"/>
<property name="framework" value="net-1.0"/>
<call target="testclient"/>
</target>
@@ -137,10 +132,10 @@
<call target="testdb"/>
<property name="config" value="tcp_compressed"/>
<call target="testdb"/>
- <property name="config" value="pipe"/>
+<!-- <property name="config" value="pipe"/>
<call target="testdb"/>
<property name="config" value="pipe_compressed"/>
- <call target="testdb"/>
+ <call target="testdb"/> -->
</target>
<!--
@@ -183,11 +178,14 @@
<target name="testdb" description="Target to test a database with all possible configurations">
<copy file="testsuite/configs/${config}.config" tofile="bin/${framework}/${buildType}/MySql.Data.Tests.dll.config"/>
- <exec unless="${doCoverage}" program="${nunit}/nunit-console.exe"
+ <property name="nunit-exe" value="${nunit}/bin/nunit-console.exe"/>
+ <property name="nunit-exe" value="${nunit}/mono/bin/nunit-console.exe" if="${string::contains(framework, 'mono')}"/>
+
+ <exec unless="${doCoverage}" program="${nunit-exe}"
commandline="/exclude=${excludes} /xml=../../../results/nunit-${framework}-${buildType}.xml bin/${framework}/${buildType}/MySql.Data.Tests.dll"
failonerror="true"/>
<exec if="${doCoverage}" program="${ncover.executable}"
- commandline="/c "${nunit}/nunit-console.exe" "bin/${framework}/${buildType}/MySql.Data.Tests.dll /exclude=${excludes} /xml=../../../results/nunit-${framework}-${buildType}.xml" /a MySql.Data /o results/ncover-${framework}-${config}.xml"
+ commandline="/c "${nunit-exe}" "bin/${framework}/${buildType}/MySql.Data.Tests.dll /exclude=${excludes} /xml=../../../results/nunit-${framework}-${buildType}.xml" /a MySql.Data /o results/ncover-${framework}-${config}.xml"
failonerror="true"/>
</target>
Modified: branches/1.0/Installer/main.wxs
===================================================================
--- branches/1.0/Installer/main.wxs 2005-09-23 16:20:40 UTC (rev 182)
+++ branches/1.0/Installer/main.wxs 2005-09-27 02:29:23 UTC (rev 183)
@@ -25,15 +25,20 @@
<Directory Id="Bin11" Name="NET11" LongName=".NET 1.1">
<Component Id="Net11" Guid="77e80230-2238-49be-a4ed-49b5213c9a3a">
<File Id="CoreBin11" Name="MD11" LongName="MySql.Data.dll" src="..\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 1.0.2" Type="string" KeyPath="yes" Value="[TARGETDIR]\bin\.NET 1.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>
</Directory>
<Directory Id="Bin10" Name="NET10" LongName=".NET 1.0">
<Component Id="Net10" Guid="b18df028-1dfb-4577-95f6-2c504df41040">
<File Id="CoreBin10" Name="MD10" LongName="MySql.Data.dll" src="..\bin\net-1.0\$(var.build)\mysql.data.dll" DiskId="1" />
- <Registry Id="vs70registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.0\AssemblyFolders\MySQL Connector Net 1.0.2" Type="string" KeyPath="yes" Value="[TARGETDIR]\bin\.NET 1.0\" />
+ <Registry Id="vs70registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]\bin\.NET 1.0\" />
</Component>
</Directory>
+ <Directory Id="Mono10" Name="MONO10" LongName="Mono 1.0">
+ <Component Id="Mono10" Guid="cd75c1ef-caae-4947-ad79-d1647376f998">
+ <File Id="CoreMono10" Name="MOD10" LongName="MySql.Data.dll" src="..\bin\mono-1.0\$(var.build)\mysql.data.dll" DiskId="1" />
+ </Component>
+ </Directory>
<Component Id="GACFiles11" Guid="9c4a7297-2b9a-4013-8bdd-6c28fe041948">
<Condition><![CDATA[REGISTERGAC="1"]]></Condition>
<File Id="CoreBin11GAC" Name="MD11" LongName="MySql.Data.dll" src="..\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1" Assembly=".net" KeyPath="yes" />
@@ -230,6 +235,7 @@
<ComponentRef Id="BaseComponents"/>
<ComponentRef Id="Net11"/>
<ComponentRef Id="Net10"/>
+ <ComponentRef Id="Mono10"/>
<ComponentRef Id="StartMenuComponent"/>
<ComponentRef Id="GACFiles11"/>
<ComponentRef Id="GACFiles10"/>
| Thread |
|---|
| • Connector/NET commit: r183 - in branches/1.0: . Installer | rburnett | 27 Sep |
