stevel 2003/01/25 11:00:44
Modified: src/main/org/apache/tools/ant/taskdefs/optional/dotnet
WsdlToDotnet.java DotnetCompile.java
Log:
add src nested element, remove full listing of commands; get definition
nested elt to work properly
Revision Changes Path
1.11 +0 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
Index: WsdlToDotnet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WsdlToDotnet.java 25 Jul 2002 15:21:13 -0000 1.10
+++ WsdlToDotnet.java 25 Jan 2003 19:00:44 -0000 1.11
@@ -227,8 +227,6 @@
validate();
NetCommand command = new NetCommand(this, "WSDL", "wsdl");
command.setFailOnError(failOnError);
- //DEBUG helper
- command.setTraceCommandLine(true);
//fill in args
command.addArgument("/nologo");
command.addArgument("/out:" + destFile);
1.4 +9 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DotnetCompile.java 20 Dec 2002 14:34:31 -0000 1.3
+++ DotnetCompile.java 25 Jan 2003 19:00:44 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -737,7 +737,7 @@
if(defines.length()==0) {
return null;
} else {
- return new String(defines);
+ return "/D:"+defines;
}
}
@@ -810,6 +810,13 @@
return failOnError;
}
+ /**
+ * add a new source directory to the compile
+ * @param src
+ */
+ public void addSrc(FileSet src) {
+ filesets.add(src);
+ }
/**
* test for a string containing something useful
@@ -996,8 +1003,6 @@
*/
protected void fillInSharedParameters(NetCommand command) {
command.setFailOnError(getFailOnError());
- //DEBUG helper
- command.setTraceCommandLine(true);
//fill in args
command.addArgument("/nologo");
command.addArgument(getAdditionalModulesParameter());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
