Browse Source

add src nested element, remove full listing of commands; get definition nested elt to work properly

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273882 13f79535-47bb-0310-9956-ffa450edef68
master
Steve Loughran 22 years ago
parent
commit
872b65ba6b
2 changed files with 9 additions and 6 deletions
  1. +9
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
  2. +0
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java

+ 9
- 4
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * 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. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -737,7 +737,7 @@ public abstract class DotnetCompile
if(defines.length()==0) { if(defines.length()==0) {
return null; return null;
} else { } else {
return new String(defines);
return "/D:"+defines;
} }
} }


@@ -810,6 +810,13 @@ public abstract class DotnetCompile
return failOnError; 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 * test for a string containing something useful
@@ -996,8 +1003,6 @@ public abstract class DotnetCompile
*/ */
protected void fillInSharedParameters(NetCommand command) { protected void fillInSharedParameters(NetCommand command) {
command.setFailOnError(getFailOnError()); command.setFailOnError(getFailOnError());
//DEBUG helper
command.setTraceCommandLine(true);
//fill in args //fill in args
command.addArgument("/nologo"); command.addArgument("/nologo");
command.addArgument(getAdditionalModulesParameter()); command.addArgument(getAdditionalModulesParameter());


+ 0
- 2
src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java View File

@@ -227,8 +227,6 @@ public class WsdlToDotnet extends Task {
validate(); validate();
NetCommand command = new NetCommand(this, "WSDL", "wsdl"); NetCommand command = new NetCommand(this, "WSDL", "wsdl");
command.setFailOnError(failOnError); command.setFailOnError(failOnError);
//DEBUG helper
command.setTraceCommandLine(true);
//fill in args //fill in args
command.addArgument("/nologo"); command.addArgument("/nologo");
command.addArgument("/out:" + destFile); command.addArgument("/out:" + destFile);


Loading…
Cancel
Save