From 74c147ed2ae75824b2c163c41631945f414341bd Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 11 Aug 2004 09:37:42 +0000
Subject: [PATCH] Make NetCommand#setDirectory actually do something

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276768 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Execute.java       | 8 ++++++++
 .../tools/ant/taskdefs/optional/dotnet/NetCommand.java    | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index dece5c655..258763d2d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -382,6 +382,14 @@ public class Execute {
         }
     }
 
+    /**
+     * @since Ant 1.7
+     */
+    public File getWorkingDirectory() {
+        return workingDirectory == null ? new File(antWorkingDirectory)
+                                        : workingDirectory;
+    }
+
     /**
      * Set the name of the antRun script using the project's value.
      *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
index 6304e3b5c..c2eec8b2c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
@@ -126,7 +126,6 @@ public class NetCommand {
         this.program = program;
         commandLine = new Commandline();
         commandLine.setExecutable(program);
-        prepareExecutor();
     }
 
 
@@ -207,7 +206,8 @@ public class NetCommand {
      *
      *@param  argument1  The first argument
      *@param  argument2  The second argument
-     */   public void addArgument(String argument1, String argument2) {
+     */   
+    public void addArgument(String argument1, String argument2) {
         if (argument2 != null && argument2.length() != 0) {
             commandLine.createArgument().setValue(argument1 + argument2);
         }
@@ -277,13 +277,16 @@ public class NetCommand {
      */
     public void runCommand()
              throws BuildException {
+        prepareExecutor();
         int err = -1;
         // assume the worst
         try {
             if (traceCommandLine) {
+                owner.log("In directory " + executable.getWorkingDirectory());
                 owner.log(commandLine.describeCommand());
             } else {
                 //in verbose mode we always log stuff
+                logVerbose("In directory " + executable.getWorkingDirectory());
                 logVerbose(commandLine.describeCommand());
             }
             setExecutableCommandLine();