SOURCES: ant-antRun.patch, ant-ant_d.patch (REMOVED) - ant update ...

[sls]

Author: sls                          Date: Wed Jan  3 19:39:39 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- ant update to 1.7.0:
-	outdated patch ant-ant_d removed
-	patch antRun updated

---- Files affected:
SOURCES:
   ant-antRun.patch (1.1 -> 1.2) , ant-ant_d.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/ant-antRun.patch
diff -u SOURCES/ant-antRun.patch:1.1 SOURCES/ant-antRun.patch:1.2
--- SOURCES/ant-antRun.patch:1.1	Tue Sep 12 15:04:30 2006
+++ SOURCES/ant-antRun.patch	Wed Jan  3 20:39:34 2007
@@ -2,32 +2,32 @@
 --- 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",
-                                        getLocation());
-             }
--            String antRun = getProject().resolveFile(ant + "/bin/antRun").toString();
-+            String antRun = getProject().resolveFile("@BINDIR@/antRun").toString();
- 
-             command = antRun + " " + dir + " " + command;
-         }
+                             + "found", getLocation());
+                     }
+ 
+-                    String antRun = getProject().resolveFile(ant + "/bin/antRun.bat").toString();
++                    String antRun = getProject().resolveFile("@BINDIR@/antRun.bat").toString();
+                     command = antRun + " " + dir + " " + command;
+                 }
+             }
 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;
-         } else {
-             // Generic
--            shellLauncher = new ScriptCommandLauncher("bin/antRun",
-+            shellLauncher = new ScriptCommandLauncher("antRun",
-                 new CommandLauncher());
-         }
-     }
+             }
+         } else {
+             // Generic
+-            shellLauncher = new ScriptCommandLauncher("bin/antRun",
++            shellLauncher = new ScriptCommandLauncher("antRun",
+                 new CommandLauncher());
+         }
+     }
 @@ -1038,7 +1038,7 @@
-                 throw new IOException("Cannot locate antRun script: "
-                     + "Property 'ant.home' not found");
-             }
--            String antRun = project.resolveFile(antHome + File.separator + myScript).toString();
-+            String antRun = project.resolveFile("@BINDIR@" + File.separator + myScript).toString();
- 
-             // Build the command
-             File commandDir = workingDir;
+             }
+             String antRun =
+                 FILE_UTILS.resolveFile(project.getBaseDir(),
+-                        antHome + File.separator + myScript).toString();
++                        "@BINDIR@" + File.separator + myScript).toString();
+ 
+             // Build the command
+             File commandDir = workingDir;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ant-antRun.patch?r1=1.1&r2=1.2&f=u