bodewig 2005/03/14 04:10:24
Modified: docs/manual/OptionalTasks csc.html jsharpc.html vbc.html
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java JSharp.java VisualBasicCompile.java
Log:
includes for .NET tasks doesn't work as expected. PR 24194
Revision Changes Path
1.5 +2 -2 ant/docs/manual/OptionalTasks/csc.html
Index: csc.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/csc.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- csc.html 19 Nov 2004 09:07:11 -0000 1.4
+++ csc.html 14 Mar 2005 12:10:23 -0000 1.5
@@ -46,7 +46,7 @@
</td></tr>
<tr><td><blockquote>
- Compiles C# source into executables or modules. csc.exe on Windows
or mcs on any other platform must be on the execute path, unless another
executable or the full path to that executable is specified in the
<tt>executable</tt> parameter <p> All parameters are optional:
<code><csc/></code> should suffice to produce a debug build of all *.cs
files. However, naming an <tt>destFile</tt>stops the csc compiler from choosing
an output name from random, and allows the dependency checker to determine if
the file is out of date. <p> The task is a directory based task, so attributes
like <b>includes="*.cs" </b> and <b>excludes="broken.cs"</b> can be used to
control the files pulled in. By default, all *.cs files from the project folder
down are included in the command. When this happens the output file -if not
specified- is taken as the first file in the list, which may be somewhat hard
to control. Specifying the output file with <tt>destFile</tt> seems prudent.
<p> <p> For more complex source trees, nested <tt>src</tt> elements can be
supplied. When such an element is present, the implicit fileset is ignored.
This makes sense, when you think about it :) <p> References to external files
can be made through the references attribute, or (since Ant1.6), via nested
<code><reference></code> filesets. With the latter, the timestamps of the
references are also used in the dependency checking algorithm. <p> Example
<pre><csc optimize="true" debug="false"
docFile="documentation.xml" warnLevel="4"
unsafe="false" targetType="exe"
incremental="false" mainClass = "MainApp"
destFile="NetApp.exe" > <src dir="src" includes="*.cs"/>
<reference file="${testCSC.dll}"/> <define name="RELEASE"/>
<define name="DEBUG" if="debug.property"/> <define name="def3"
unless="def3.property"/> </csc> </pre>
+ Compiles C# source into executables or modules. csc.exe on Windows
or mcs on any other platform must be on the execute path, unless another
executable or the full path to that executable is specified in the
<tt>executable</tt> parameter <p> All parameters are optional:
<code><csc/></code> should suffice to produce a debug build of all *.cs
files. However, naming an <tt>destFile</tt>stops the csc compiler from choosing
an output name from random, and allows the dependency checker to determine if
the file is out of date. <p> The task is a directory based task, so attributes
like <b>includes="*.cs" </b> and <b>excludes="broken.cs"</b> can be used to
control the files pulled in. By default, all *.cs files from the project folder
down are included in the command. When this happens the output file -if not
specified- is taken as the first file in the list, which may be somewhat hard
to control. Specifying the output file with <tt>destFile</tt> seems prudent.
<p> <p> For more complex source trees, nested <tt>src</tt> elements can be
supplied. When such an element is present, the implicit fileset is ignored.
This makes sense, when you think about it :) <p>For historical reasons the
pattern <code>**/*.cs</code> is preset as includes list and you can not
override it with an explicit includes attribute. Use nested
<code><src></code> elements instead of the basedir attribute if you need
more control.</p> <p> References to external files can be made through the
references attribute, or (since Ant1.6), via nested
<code><reference></code> filesets. With the latter, the timestamps of the
references are also used in the dependency checking algorithm. <p> Example
<pre><csc optimize="true" debug="false"
docFile="documentation.xml" warnLevel="4"
unsafe="false" targetType="exe"
incremental="false" mainClass = "MainApp"
destFile="NetApp.exe" > <src dir="src" includes="*.cs"/>
<reference file="${testCSC.dll}"/> <define name="RELEASE"/>
<define name="DEBUG" if="debug.property"/> <define name="def3"
unless="def3.property"/> </csc> </pre>
</blockquote></td></tr>
</table>
@@ -503,7 +503,7 @@
<tr>
<td>
<div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 2000-2004, The Apache Software Foundation. All
Rights Reserved.
+ Copyright © 2000-2005, The Apache Software Foundation. All
Rights Reserved.
</em></font></div>
</td>
</tr>
1.4 +1 -1 ant/docs/manual/OptionalTasks/jsharpc.html
Index: jsharpc.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/jsharpc.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jsharpc.html 14 Mar 2005 11:52:12 -0000 1.3
+++ jsharpc.html 14 Mar 2005 12:10:23 -0000 1.4
@@ -18,7 +18,7 @@
<td valign="bottom">
<font size="+3" face="arial,helvetica,sanserif"><strong>Jsharpc
Task</strong></font>
- <br><font face="arial,helvetica,sanserif">Compile J# source down
to a managed .NET application.</font>
+ <br><font face="arial,helvetica,sanserif">Compile J# source down
to a managed .NET application. <p>For historical reasons the pattern
<code>**/*.java</code> is preset as includes list and you can not override it
with an explicit includes attribute. Use nested <code><src></code>
elements instead of the basedir attribute if you need more control.</p></font>
</td>
<td>
<!-- PROJECT LOGO -->
1.3 +2 -2 ant/docs/manual/OptionalTasks/vbc.html
Index: vbc.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/vbc.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vbc.html 19 Nov 2004 09:07:11 -0000 1.2
+++ vbc.html 14 Mar 2005 12:10:23 -0000 1.3
@@ -18,7 +18,7 @@
<td valign="bottom">
<font size="+3" face="arial,helvetica,sanserif"><strong>Vbc
Task</strong></font>
- <br><font face="arial,helvetica,sanserif">This task compiles
Visual Basic.NET source into executables or modules.</font>
+ <br><font face="arial,helvetica,sanserif">This task compiles
Visual Basic.NET source into executables or modules. <p>For historical reasons
the pattern <code>**/*.vb</code> is preset as includes list and you can not
override it with an explicit includes attribute. Use nested
<code><src></code> elements instead of the basedir attribute if you need
more control.</p></font>
</td>
<td>
<!-- PROJECT LOGO -->
@@ -479,7 +479,7 @@
<tr>
<td>
<div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 2000-2004, The Apache Software Foundation. All
Rights Reserved.
+ Copyright © 2000-2005, The Apache Software Foundation. All
Rights Reserved.
</em></font></div>
</td>
</tr>
1.46 +8 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- CSharp.java 22 Nov 2004 09:23:33 -0000 1.45
+++ CSharp.java 14 Mar 2005 12:10:23 -0000 1.46
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -60,8 +60,14 @@
* For more complex source trees, nested <tt>src</tt> elemements can be
* supplied. When such an element is present, the implicit fileset is
ignored.
* This makes sense, when you think about it :)
- * <p>
*
+ * <p>For historical reasons the pattern
+ * <code>**</code><code>/*.cs</code> is preset as includes list and
+ * you can not override it with an explicit includes attribute. Use
+ * nested <code><src></code> elements instead of the basedir
+ * attribute if you need more control.</p>
+ *
+ * <p>
* References to external files can be made through the references attribute,
* or (since Ant1.6), via nested <reference> filesets. With the latter,
* the timestamps of the references are also used in the dependency
1.13 +7 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java
Index: JSharp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JSharp.java 9 Mar 2004 16:48:18 -0000 1.12
+++ JSharp.java 14 Mar 2005 12:10:24 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,12 @@
* generates a .NET managed exe or dll.
* <p>
*
+ * <p>For historical reasons the pattern
+ * <code>**</code><code>/*.java</code> is preset as includes list and
+ * you can not override it with an explicit includes attribute. Use
+ * nested <code><src></code> elements instead of the basedir
+ * attribute if you need more control.</p>
+ *
* @see
<A=ref="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_vjsharp/html/vjoriMicrosoftVisualJ.asp";>
* Visual J++ online documentation</a>
*
1.14 +7 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java
Index: VisualBasicCompile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- VisualBasicCompile.java 9 Mar 2004 16:48:18 -0000 1.13
+++ VisualBasicCompile.java 14 Mar 2005 12:10:24 -0000 1.14
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,6 +43,12 @@
<p>
* Also, dependency checking only works if destfile is set.
*
+ * <p>For historical reasons the pattern
+ * <code>**</code><code>/*.vb</code> is preset as includes list and
+ * you can not override it with an explicit includes attribute. Use
+ * nested <code><src></code> elements instead of the basedir
+ * attribute if you need more control.</p>
+ *
* As with <csc> nested <tt>src</tt> filesets of source,
* reference filesets, definitions and resources can be provided.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
