- fix breakage caused by our packaging

Changed files:
    ant-antRun.patch -> 1.1

diff --git a/ant-antRun.patch b/ant-antRun.patch
new file mode 100644 (file)
index 0000000..c52b678
--- /dev/null
+++ b/ant-antRun.patch
@@ -0,0 +1,33 @@
+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
+--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Exec.java  2005-06-02 15:19:56.000000000 +0200
++++ apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Exec.java   2006-09-12 14:57:55.000000000 +0200
+@@ -99,7 +99,7 @@
+               throw new BuildException("Property 'ant.home' not found",\r
+                                        getLocation());\r
+             }\r
+-            String antRun = getProject().resolveFile(ant + "/bin/antRun").toString();\r
++            String antRun = getProject().resolveFile("@BINDIR@/antRun").toString();\r
+ \r
+             command = antRun + " " + dir + " " + command;\r
+         }\r
+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
+--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Execute.java       2005-06-02 15:19:56.000000000 +0200
++++ apache-ant-1.6.5-antRun/src/main/org/apache/tools/ant/taskdefs/Execute.java        2006-09-12 15:01:09.000000000 +0200
+@@ -127,7 +127,7 @@
+             shellLauncher = vmLauncher;\r
+         } else {\r
+             // Generic\r
+-            shellLauncher = new ScriptCommandLauncher("bin/antRun",\r
++            shellLauncher = new ScriptCommandLauncher("antRun",\r
+                 new CommandLauncher());\r
+         }\r
+     }\r
+@@ -1038,7 +1038,7 @@
+                 throw new IOException("Cannot locate antRun script: "\r
+                     + "Property 'ant.home' not found");\r
+             }\r
+-            String antRun = project.resolveFile(antHome + File.separator + myScript).toString();\r
++            String antRun = project.resolveFile("@BINDIR@" + File.separator + myScript).toString();\r
+ \r
+             // Build the command\r
+             File commandDir = workingDir;\r