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 DotnetCompile.java
Date Tue, 23 Sep 2003 08:29:08 GMT
bodewig     2003/09/23 01:29:07

  Modified:    docs/manual/OptionalTasks Tag: ANT_16_BRANCH dotnet.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 DotnetCompile.java
  Log:
  Merge Mono and doc fixes for <csc> from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.10.2.1  +2 -3      ant/docs/manual/OptionalTasks/dotnet.html
  
  Index: dotnet.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- dotnet.html	1 Dec 2002 01:31:05 -0000	1.10
  +++ dotnet.html	23 Sep 2003 08:29:07 -0000	1.10.2.1
  @@ -117,9 +117,8 @@
     </tr>
     <tr>
       <td valign="top">includeDefaultReferences</td>
  -    <td valign="top">Flag which when true automatically includes
  -    the common assemblies in dotnet, and tells the compiler to link in
  -    mscore.dll
  +    <td valign="top">Controls csc's /nostdlib argument,
  +    &quot;true&quot;(default) implies /nostdlib-.
       </td>
       <td valign="top">&quot;true&quot;(default) or &quot;false&quot;</td>
     </tr>
  
  
  
  No                   revision
  No                   revision
  1.13.2.1  +4 -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
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- dotnet.xml	21 Sep 2003 22:29:54 -0000	1.13
  +++ dotnet.xml	23 Sep 2003 08:29:07 -0000	1.13.2.1
  @@ -142,7 +142,7 @@
         destFile="${testCSC.exe}"
         targetType="exe"
         executable="mcs"
  -      includedefaultreferences="false"
  +      includedefaultreferences="true"
         >
       </csc>
       <available property="app.created" file="${testCSC.exe}"/>
  @@ -179,7 +179,7 @@
         targetType="exe"
         srcDir="."
         executable="mcs"
  -      includedefaultreferences="false"
  +      includedefaultreferences="true"
         >
       </csc>
       <available property="app.created" file="${testCSC.exe}"/>
  @@ -213,7 +213,7 @@
         destFile="${testCSC.dll}"
         targetType="library"
         executable="mcs"
  -      includedefaultreferences="false"
  +      includedefaultreferences="true"
         >
         <src dir="${src.dir}" includes="example2.cs"/>
       </csc>
  @@ -251,7 +251,7 @@
         destFile="${testCscReferences.exe}"
         targetType="exe"
         executable="mcs"
  -      includedefaultreferences="false"
  +      includedefaultreferences="true"
         >
         <src file="${src.dir}/example.cs"/>
         <reference file="${testCSC.dll}" />
  
  
  
  No                   revision
  No                   revision
  1.17.2.1  +2 -4      ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
  
  Index: DotnetCompile.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- DotnetCompile.java	21 Sep 2003 22:29:54 -0000	1.17
  +++ DotnetCompile.java	23 Sep 2003 08:29:07 -0000	1.17.2.1
  @@ -115,7 +115,7 @@
       /**
        *  flag to enable automatic reference inclusion
        */
  -    private boolean includeDefaultReferences;
  +    private boolean includeDefaultReferences = true;
   
       /**
        *  icon for incorporation into apps
  @@ -313,7 +313,7 @@
        * in dotnet, and tells the compiler to link in mscore.dll.
        *
        *  set the automatic reference inclusion flag on or off this flag controls
  -     *  the string of references and the /nostdlib option in CSC
  +     *  the /nostdlib option in CSC
        *
        *@param  f  on/off flag
        */
  @@ -640,8 +640,6 @@
       protected String getUtf8OutputParameter() {
           return utf8output ? "/utf8output" : null;
       }
  -
  -
   
   
       /**
  
  
  

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


Mime
View raw message