From 872b65ba6b217dac542e6f55f5e22fcc0c0af84d Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Sat, 25 Jan 2003 19:00:44 +0000 Subject: [PATCH] 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 --- .../ant/taskdefs/optional/dotnet/DotnetCompile.java | 13 +++++++++---- .../ant/taskdefs/optional/dotnet/WsdlToDotnet.java | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java index ff8f1739f..da3ac49b2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java @@ -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 @@ public abstract class DotnetCompile if(defines.length()==0) { return null; } else { - return new String(defines); + return "/D:"+defines; } } @@ -810,6 +810,13 @@ public abstract class DotnetCompile 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 @@ public abstract class DotnetCompile */ protected void fillInSharedParameters(NetCommand command) { command.setFailOnError(getFailOnError()); - //DEBUG helper - command.setTraceCommandLine(true); //fill in args command.addArgument("/nologo"); command.addArgument(getAdditionalModulesParameter()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java index c558e1ed8..862ec76a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java @@ -227,8 +227,6 @@ public class WsdlToDotnet extends Task { 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);