You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2006/08/24 21:53:17 UTC
svn commit: r434484 - in
/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet: ./ compile/
Author: bodewig
Date: Thu Aug 24 12:53:16 2006
New Revision: 434484
URL: http://svn.apache.org/viewvc?rev=434484&view=rev
Log:
copy the core tasks, no changes yet, tests need to be migrated as well
Added:
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/Ildasm.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/ImportTypelib.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/NetCommand.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetResource.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/Ilasm.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/JSharp.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java
- copied, changed from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
Modified:
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/antlib.xml
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/Ildasm.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/Ildasm.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/Ildasm.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/Ildasm.java Thu Aug 24 12:53:16 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.BuildException;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/ImportTypelib.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/ImportTypelib.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/ImportTypelib.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/ImportTypelib.java Thu Aug 24 12:53:16 2006
@@ -15,7 +15,7 @@
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/NetCommand.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/NetCommand.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/NetCommand.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/NetCommand.java Thu Aug 24 12:53:16 2006
@@ -22,7 +22,7 @@
*/
// place below the optional ant tasks package
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet;
// imports
Modified: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/antlib.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/antlib.xml?rev=434484&r1=434483&r2=434484&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/antlib.xml (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/antlib.xml Thu Aug 24 12:53:16 2006
@@ -35,4 +35,25 @@
name="nunit"
classname="org.apache.ant.dotnet.NUnitTask"
/>
+ <taskdef
+ name="csc"
+ classname="org.apache.ant.dotnet.compile.CSharp"/>
+ <taskdef
+ name="jsharpc"
+ classname="org.apache.ant.dotnet.compile.JSharp"/>
+ <taskdef
+ name="vbc"
+ classname="org.apache.ant.dotnet.compile.VisualBasicCompile"/>
+ <taskdef
+ name="ildasm"
+ classname="org.apache.ant.dotnet.Ildasm"/>
+ <taskdef
+ name="ilasm"
+ classname="org.apache.ant.dotnet.compile.Ilasm"/>
+ <taskdef
+ name="wsdltodotnet"
+ classname="org.apache.ant.dotnet.compile.WsdlToDotnet"/>
+ <taskdef
+ name="importtypelib"
+ classname="org.apache.ant.dotnet.ImportTypelib"/>
</antlib>
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java Thu Aug 24 12:53:16 2006
@@ -25,12 +25,13 @@
// but in its own dotnet group
// ====================================================================
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
// ====================================================================
// imports
// ====================================================================
+import org.apache.ant.dotnet.NetCommand;
import java.io.File;
// ====================================================================
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetBaseMatchingTask.java Thu Aug 24 12:53:16 2006
@@ -15,7 +15,9 @@
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
+
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.taskdefs.condition.Os;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetCompile.java Thu Aug 24 12:53:16 2006
@@ -24,7 +24,7 @@
// place in the optional ant tasks package
// but in its own dotnet group
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
// imports
@@ -32,6 +32,8 @@
import java.util.Vector;
import java.util.Enumeration;
import java.util.Hashtable;
+
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetDefine.java Thu Aug 24 12:53:16 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetResource.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetResource.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetResource.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/DotnetResource.java Thu Aug 24 12:53:16 2006
@@ -14,8 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
import java.io.File;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/Ilasm.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/Ilasm.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/Ilasm.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/Ilasm.java Thu Aug 24 12:53:16 2006
@@ -20,11 +20,13 @@
* nap: Underworld - Everything, Everything
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
import java.io.File;
import java.util.Vector;
+
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/JSharp.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/JSharp.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/JSharp.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/JSharp.java Thu Aug 24 12:53:16 2006
@@ -14,8 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/VisualBasicCompile.java Thu Aug 24 12:53:16 2006
@@ -15,8 +15,9 @@
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
Copied: ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java (from r434477, ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java)
URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java?p2=ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java&p1=ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java&r1=434477&r2=434484&rev=434484&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java (original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/WsdlToDotnet.java Thu Aug 24 12:53:16 2006
@@ -14,12 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.tools.ant.taskdefs.optional.dotnet;
+package org.apache.ant.dotnet.compile;
import java.io.File;
import java.util.Vector;
import java.util.Iterator;
import java.net.MalformedURLException;
+
+import org.apache.ant.dotnet.NetCommand;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org