ant-antRun.patch

   1 diff -ur apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Exec.java apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Exec.java
   2 --- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Exec.java   2005-06-02 15:19:56.000000000 +0200
   3 +++ apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Exec.java    2006-09-12 14:57:55.000000000 +0200
   4 @@ -99,7 +99,7 @@
   5                throw new BuildException("Property 'ant.home' not found",\r
   6                                         getLocation());\r
   7              }\r
   8 -            String antRun = getProject().resolveFile(ant + "/bin/antRun").toString();\r
   9 +            String antRun = getProject().resolveFile("@BINDIR@/antRun").toString();\r
  10  \r
  11              command = antRun + " " + dir + " " + command;\r
  12          }\r
  13 diff -ur apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Execute.java apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Execute.java
  14 --- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Execute.java        2005-06-02 15:19:56.000000000 +0200
  15 +++ apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Execute.java 2006-09-12 15:01:09.000000000 +0200
  16 @@ -127,7 +127,7 @@
  17              shellLauncher = vmLauncher;\r
  18          } else {\r
  19              // Generic\r
  20 -            shellLauncher = new ScriptCommandLauncher("bin/antRun",\r
  21 +            shellLauncher = new ScriptCommandLauncher("antRun",\r
  22                  new CommandLauncher());\r
  23          }\r
  24      }\r
  25 @@ -1038,7 +1038,7 @@
  26                  throw new IOException("Cannot locate antRun script: "\r
  27                      + "Property 'ant.home' not found");\r
  28              }\r
  29 -            String antRun = project.resolveFile(antHome + File.separator + myScript).toString();\r
  30 +            String antRun = project.resolveFile("@BINDIR@" + File.separator + myScript).toString();\r
  31  \r
  32              // Build the command\r
  33              File commandDir = workingDir;\r