ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet CSharp.java
Date Tue, 25 Nov 2003 09:18:04 GMT
bodewig     2003/11/25 01:18:04

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               docs/manual/OptionalTasks Tag: ANT_16_BRANCH csc.html
               src/etc/testcases/taskdefs/optional Tag: ANT_16_BRANCH
                        dotnet.xml
               src/main/org/apache/tools/ant/taskdefs/optional/dotnet Tag:
                        ANT_16_BRANCH CSharp.java
  Log:
  Merge from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.14 +5 -1      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.13
  retrieving revision 1.503.2.14
  diff -u -r1.503.2.13 -r1.503.2.14
  --- WHATSNEW	18 Nov 2003 17:16:28 -0000	1.503.2.13
  +++ WHATSNEW	25 Nov 2003 09:18:04 -0000	1.503.2.14
  @@ -9,6 +9,8 @@
     of nested elements was ant's namespace uri. This change will affect users
     of ant 1.6b1 and ant 1.6b2.
   
  +* <csc>'s executable attribute defaults to mcs on non-Windows platforms.
  +
   Fixed bugs:
   -----------
   * better debugging support for ApacheCatalogResolver
  @@ -57,7 +59,9 @@
   --------------
   * Change default uri from ant:core to antlib:org.apache.tools.ant
   
  -* upgrade to xml-apis.jar from Xerces-J 2.5.0.
  +* upgrade to xml-apis.jar from Xerces-J 2.6.0.
  +
  +* Shipped XML parser is now Xerces 2.6.0
   
   * set project for created targets.
   
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +1 -1      ant/docs/manual/OptionalTasks/csc.html
  
  Index: csc.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/csc.html,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- csc.html	9 Oct 2003 21:01:11 -0000	1.1.2.2
  +++ csc.html	25 Nov 2003 09:18:04 -0000	1.1.2.3
  @@ -47,7 +47,7 @@
         </td></tr>
   
         <tr><td><blockquote>
  -        Compiles C# source into executables or modules. csc.exe 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: &lt;csc/&gt; 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> elemements 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 &lt;reference&gt; filesets. With the latter, the timestamps of
the references are also used in the dependency checking algorithm. <p> Example <pre>&lt;csc
optimize=&quot;true&quot; debug=&quot;false&quot; docFile=&quot;documentation.xml&quot;
warnLevel=&quot;4&quot; unsafe=&quot;false&quot; targetType=&quot;exe&quot;
incremental=&quot;false&quot; mainClass = &quot;MainApp&quot; destFile=&quot;NetApp.exe&quot;
&gt; &lt;src dir="src" includes="*.cs" /&gt; &lt;reference file="${testCSC.dll}"
/&gt; &lt;define name="RELEASE" /&gt; &lt;define name="DEBUG" if="debug.property"/&gt;
&lt;define name="def3" unless="def3.property"/&gt; &lt;/csc&gt; </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: &lt;csc/&gt; 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>
elemements 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 &lt;reference&gt;
filesets. With the latter, the timestamps of the references are also used in the dependency
checking algorithm. <p> Example <pre>&lt;csc optimize=&quot;true&quot;
debug=&quot;false&quot; docFile=&quot;documentation.xml&quot; warnLevel=&quot;4&quot;
unsafe=&quot;false&quot; targetType=&quot;exe&quot; incremental=&quot;false&quot;
mainClass = &quot;MainApp&quot; destFile=&quot;NetApp.exe&quot; &gt; &lt;src
dir="src" includes="*.cs" /&gt; &lt;reference file="${testCSC.dll}" /&gt; &lt;define
name="RELEASE" /&gt; &lt;define name="DEBUG" if="debug.property"/&gt; &lt;define
name="def3" unless="def3.property"/&gt; &lt;/csc&gt; </pre>
         </blockquote></td></tr>
   
       </table>
  
  
  
  No                   revision
  No                   revision
  1.13.2.4  +0 -4      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.13.2.3
  retrieving revision 1.13.2.4
  diff -u -r1.13.2.3 -r1.13.2.4
  --- dotnet.xml	24 Oct 2003 05:54:23 -0000	1.13.2.3
  +++ dotnet.xml	25 Nov 2003 09:18:04 -0000	1.13.2.4
  @@ -156,7 +156,6 @@
       <csc
         destFile="${testCSC.exe}"
         targetType="exe"
  -      executable="mcs"
         includedefaultreferences="true"
         >
       </csc>
  @@ -193,7 +192,6 @@
         destFile="${testCSC.exe}"
         targetType="exe"
         srcDir="."
  -      executable="mcs"
         includedefaultreferences="true"
         >
       </csc>
  @@ -227,7 +225,6 @@
       <csc
         destFile="${testCSC.dll}"
         targetType="library"
  -      executable="mcs"
         includedefaultreferences="true"
         >
         <src dir="${src.dir}" includes="example2.cs"/>
  @@ -265,7 +262,6 @@
       <csc
         destFile="${testCscReferences.exe}"
         targetType="exe"
  -      executable="mcs"
         includedefaultreferences="true"
         >
         <src file="${src.dir}/example.cs"/>
  
  
  
  No                   revision
  No                   revision
  1.36.2.2  +4 -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.36.2.1
  retrieving revision 1.36.2.2
  diff -u -r1.36.2.1 -r1.36.2.2
  --- CSharp.java	27 Sep 2003 03:00:05 -0000	1.36.2.1
  +++ CSharp.java	25 Nov 2003 09:18:04 -0000	1.36.2.2
  @@ -70,12 +70,14 @@
   
   import java.io.File;
   
  +import org.apache.tools.ant.taskdefs.condition.Os;
  +
   // ====================================================================
   
   /**
    *  Compiles C# source into executables or modules.
    *
  - * csc.exe must be on the execute path, unless another executable
  + * csc.exe on Windows or mcs on other platforms 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>
  @@ -190,7 +192,7 @@
           unsafe = false;
           noconfig = false;
           definitions = null;
  -        setExecutable("csc");
  +        setExecutable(Os.isFamily("windows") ? "csc" : "mcs");
       }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message