stevel 2003/03/10 22:10:47
Modified: src/etc/testcases/taskdefs/optional dotnet.xml src/etc/testcases/taskdefs/optional/dotnet example.cs Added: src/etc/testcases/taskdefs/optional/dotnet example2.cs Log: dotnet tests in the build file. with the references and definitions, we are almost nearing a workable .net solution in ant. Which makes this a good candiate for tearing out into a standalone project, were it more popular Revision Changes Path 1.2 +36 -3 ant/src/etc/testcases/taskdefs/optional/dotnet.xml Index: dotnet.xml =================================================================== RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dotnet.xml 10 Mar 2003 08:03:24 -0000 1.1 +++ dotnet.xml 11 Mar 2003 06:10:46 -0000 1.2 @@ -70,10 +70,43 @@ <src dir="${src.dir}" includes="**/*.cs"/> </csc> <available property="app.created" file="${testCSC.exe}"/> - <fail unless="app.created">No app ${testCSC.exe}created</fail> + <fail unless="app.created">No app ${testCSC.exe} created</fail> <exec executable="${testCSC.exe}" failonerror="true" /> </target> + + <target name="testCSCdll" depends="init"> + <property name="testCSC.dll" + location="${build.dir}/Example2.dll" /> + <csc + destFile="${testCSC.dll}" + targetType="library" + > + <src dir="${src.dir}" includes="example2.cs"/> + </csc> + <available property="dll.created" file="${testCSC.dll}"/> + <fail unless="dll.created">No file ${testCSC.dll} created</fail> + </target> + + <target name="testCscReferences" depends="init,testCSCdll"> + <property name="testCscReferences.exe" + location="${build.dir}/ExampleCsc2.exe" /> + <csc + destFile="${testCscReferences.exe}" + targetType="exe" + > + <src file="${src.dir}/example.cs"/> + <reference file="${testCSC.dll}" /> + <define name="RELEASE" /> + <define name="DEBUG" if="undefined.property"/> + <define name="def3" unless="undefined.property"/> + </csc> + <available property="refapp.created" file="${testCscReferences.exe}"/> + <fail unless="refapp.created">No app ${testCscReferences.exe} created</fail> + <exec executable="${testCscReferences.exe}" failonerror="true" /> + </target> + + <target name="testILASM" depends="init"> <property name="testILASM.exe" location="${build.dir}/ExampleIlasm.exe" /> @@ -83,8 +116,8 @@ > <src dir="${src.dir}" includes="**/*.il"/> </ilasm> - <available property="app.created" file="${testILASM.exe}"/> - <fail unless="app.created">No app ${testCSC.exe}created</fail> + <available property="ilasm.created" file="${testILASM.exe}"/> + <fail unless="ilasm.created">No app ${testCSC.exe} created</fail> <exec executable="${testILASM.exe}" failonerror="true" /> </target> 1.2 +1 -1 ant/src/etc/testcases/taskdefs/optional/dotnet/example.cs Index: example.cs =================================================================== RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet/example.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- example.cs 10 Mar 2003 08:03:24 -0000 1.1 +++ example.cs 11 Mar 2003 06:10:47 -0000 1.2 @@ -57,6 +57,6 @@ public class Example { public static void Main(String[] args) { - Console.WriteLine("hello, I look like Java, but I'm really .NET"); + Example2.echo(); } } 1.1 ant/src/etc/testcases/taskdefs/optional/dotnet/example2.cs Index: example2.cs =================================================================== /* * The Apache Software License, Version 1.1 * * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "Ant" and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ using System; /** * this is just here to create confusion */ public class Example2 { public int some_variable=3; public static void echo() { Console.WriteLine("hello, I look like Java, but I'm really .NET"); } }