Author: gert
Date: 2008-02-10 10:37:41 -0500 (Sun, 10 Feb 2008)
New Revision: 95381
Modified:
trunk/gert/standalone/bug79424/default.build
trunk/gert/standalone/bug79424/test.cs
Log:
Use common build. Fixed test.
Modified: trunk/gert/standalone/bug79424/default.build
===================================================================
--- trunk/gert/standalone/bug79424/default.build 2008-02-10 15:08:48 UTC
(rev 95380)
+++ trunk/gert/standalone/bug79424/default.build 2008-02-10 15:37:41 UTC
(rev 95381)
@@ -1,20 +1,6 @@
<project name="bug79424" default="rebuild">
- <target name="mono-1.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,ONLY_1_1,MONO" />
- </target>
-
- <target name="mono-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
- </target>
-
- <target name="net-1.1">
- <property name="csc.defines" value="NET_1_0,NET_1_1,ONLY_1_1" />
- </target>
-
- <target name="net-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
- </target>
-
+ <include buildfile="../../build/common.build" />
+
<property name="frameworks" value="mono-1.0,mono-2.0,net-1.1,net-2.0" />
<target name="clean">
@@ -27,22 +13,7 @@
</delete>
</target>
- <target name="build">
- <property name="original.targetframework"
value="${nant.settings.currentframework}" />
-
- <foreach property="framework" item="String" in="${frameworks}"
delim=",">
- <if test="${framework::exists(framework)}">
- <property name="nant.settings.currentframework"
value="${framework}" />
- <call
target="${nant.settings.currentframework}" />
- <call target="run" />
- <call target="clean" />
- </if>
- </foreach>
-
- <property name="nant.settings.currentframework"
value="${original.targetframework}" />
- </target>
-
- <target name="compile">
+ <target name="compile" depends="init">
<mkdir dir="bin" />
<csc target="library" output="bin/library.dll"
define="${csc.defines}" warnaserror="true" warninglevel="4">
<sources>
@@ -59,9 +30,7 @@
</csc>
</target>
- <target name="run" depends="compile">
+ <target name="run-test" depends="compile">
<exec program="test.exe" managed="true" />
</target>
-
- <target name="rebuild" depends="clean, build" />
</project>
Modified: trunk/gert/standalone/bug79424/test.cs
===================================================================
--- trunk/gert/standalone/bug79424/test.cs 2008-02-10 15:08:48 UTC (rev
95380)
+++ trunk/gert/standalone/bug79424/test.cs 2008-02-10 15:37:41 UTC (rev
95381)
@@ -5,7 +5,7 @@
using System.Reflection;
using System.Runtime.Remoting;
-public class bug76757Test
+class Program
{
static int Main ()
{
@@ -42,9 +42,7 @@
}
}
-#if MONO
- private const string expectedFileName = "library, Version=1.2.3.4,
Culture=neutral";
-#elif NET_2_0
+#if NET_2_0 || MONO
private const string expectedFileName = "library, Version=1.2.3.4,
Culture=neutral, PublicKeyToken=null";
#else
private const string expectedFileName = "library";
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
