Author: gert
Date: 2007-12-07 07:13:45 -0500 (Fri, 07 Dec 2007)
New Revision: 90913
Modified:
trunk/gert/standalone/bug81643/default.build
Log:
Use get-tool-path, and use common build.
Modified: trunk/gert/standalone/bug81643/default.build
===================================================================
--- trunk/gert/standalone/bug81643/default.build 2007-12-07 12:07:44 UTC
(rev 90912)
+++ trunk/gert/standalone/bug81643/default.build 2007-12-07 12:13:45 UTC
(rev 90913)
@@ -1,12 +1,6 @@
<project name="bug81643" default="rebuild">
- <target name="mono-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0,MONO" />
- </target>
+ <include buildfile="../../build/common.build" />
- <target name="net-2.0">
- <property name="csc.defines"
value="NET_1_0,NET_1_1,NET_2_0,ONLY_2_0" />
- </target>
-
<property name="frameworks" value="mono-2.0,net-2.0" />
<target name="clean">
@@ -18,39 +12,31 @@
</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">
<csc target="exe" define="${csc.defines}" output="test.exe"
warnaserror="true" warninglevel="4">
<sources>
<include name="test.cs" />
</sources>
</csc>
+ </target>
+
+ <target name="verify" depends="compile">
+ <property name="original.targetframework"
value="${nant.settings.currentframework}" />
+
<if test="${framework::sdk-exists('net-2.0')}">
- <exec
program="${framework::get-sdk-directory('net-2.0')+'/peverify.exe'}">
+ <property name="nant.settings.currentframework"
value="net-2.0" />
+ <call target="init" />
+ <exec
program="${framework::get-tool-path('peverify.exe')}">
<arg file="test.exe" />
<arg value="/NOLOGO" />
</exec>
</if>
- </target>
- <target name="run" depends="compile">
+ <property name="nant.settings.currentframework"
value="${original.targetframework}" />
+ </target>
+
+ <target name="run-test" depends="verify">
<exec program="test.exe" managed="true" output="out" />
<fail if="${file::exists('out')}" />
</target>
-
- <target name="rebuild" depends="clean, build" />
</project>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches