svn commit: r677879 - in /ant/antlibs/dotnet/trunk: changes.xml docs/csc.html src/main/org/apache/ant/dotnet/compile/CSharp.java

[bodewig]

Author: bodewig
Date: Fri Jul 18 04:18:24 2008
New Revision: 677879

URL: http://svn.apache.org/viewvc?rev=677879&view=rev
Log:
C# 3.0 doesn't like /incremental-

Modified:
    ant/antlibs/dotnet/trunk/changes.xml
    ant/antlibs/dotnet/trunk/docs/csc.html
    ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java

Modified: ant/antlibs/dotnet/trunk/changes.xml
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/changes.xml?rev=677879&r1=677878&r2=677879&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/changes.xml (original)
+++ ant/antlibs/dotnet/trunk/changes.xml Fri Jul 18 04:18:24 2008
@@ -38,6 +38,10 @@
     </properties>
 
     <release version="SVN trunk" date="unpublished">
+      <action type="fix">
+        CSC of .NET 3.5 doesn't support the /incremental argument
+        anymore, only set /incremental+, but never /incremental-.
+      </action>
       <action type="fix" issue="41387">
         The compilation tasks failed if the source files resided in a
         directory with spaces in its full path and a response file was

Modified: ant/antlibs/dotnet/trunk/docs/csc.html
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/docs/csc.html?rev=677879&r1=677878&r2=677879&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/docs/csc.html (original)
+++ ant/antlibs/dotnet/trunk/docs/csc.html Fri Jul 18 04:18:24 2008
@@ -235,7 +235,9 @@
           incremental
         </td>
         <td valign="top">
-          set the incremental compilation flag on or off.
+          set the incremental compilation flag on or off.  If set to
+          true this will result in adding /incremental+ to the csc
+          command line which is not supported anymore in .NET 3.5.
         </td>
         <td valign="top">
           boolean

Modified: 
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java?rev=677879&r1=677878&r2=677879&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java 
(original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java 
Fri Jul 18 04:18:24 2008
@@ -359,7 +359,9 @@
         command.addArgument(getDocFileParameter());
         command.addArgument(getFullPathsParameter());
         command.addArgument(getFileAlignParameter());
-        command.addArgument(getIncrementalParameter());
+        if (getIncremental()) {
+            command.addArgument(getIncrementalParameter());
+        }
         command.addArgument(getNoConfigParameter());
         command.addArgument(getUnsafeParameter());
     }