Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Date: 11 Aug 2004 09:37:43 -0000
Message-ID: <20040811093743.41594.qmail@minotaur.apache.org>
From: bodewig@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Execute.java

bodewig     2004/08/11 02:37:42

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        NetCommand.java
               src/main/org/apache/tools/ant/taskdefs Execute.java
  Log:
  Make NetCommand#setDirectory actually do something
  
  Revision  Changes    Path
  1.32      +5 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  
  Index: NetCommand.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- NetCommand.java	4 Aug 2004 14:35:06 -0000	1.31
  +++ NetCommand.java	11 Aug 2004 09:37:42 -0000	1.32
  @@ -126,7 +126,6 @@
           this.program = program;
           commandLine = new Commandline();
           commandLine.setExecutable(program);
  -        prepareExecutor();
       }
   
   
  @@ -207,7 +206,8 @@
        *
        *@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 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();
  
  
  
  1.83      +9 -1      ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- Execute.java	18 Jun 2004 13:42:03 -0000	1.82
  +++ Execute.java	11 Aug 2004 09:37:42 -0000	1.83
  @@ -383,6 +383,14 @@
       }
   
       /**
  +     * @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.
        *
        * @param project the current project.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org