- ant update to 1.7.0:

-	outdated patch ant-ant_d removed
-	patch antRun updated

Changed files:
    ant-antRun.patch -> 1.2
    ant-ant_d.patch -> 1.2

diff --git a/ant-antRun.patch b/ant-antRun.patch
index c52b678109e5fc27f49ea3f4899534da93ee33b5..2488390b5ea25f917db6c82393edb417e515240b 100644 (file)
--- a/ant-antRun.patch
+++ b/ant-antRun.patch
@@ -2,32 +2,32 @@ diff -ur apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/Exec.java apach
 --- 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
+                             + "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;\r
-         } else {\r
-             // Generic\r
--            shellLauncher = new ScriptCommandLauncher("bin/antRun",\r
-+            shellLauncher = new ScriptCommandLauncher("antRun",\r
-                 new CommandLauncher());\r
-         }\r
-     }\r
+             }
+         } else {
+             // Generic
+-            shellLauncher = new ScriptCommandLauncher("bin/antRun",
++            shellLauncher = new ScriptCommandLauncher("antRun",
+                 new CommandLauncher());
+         }
+     }
 @@ -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
+             }
+             String antRun =
+                 FILE_UTILS.resolveFile(project.getBaseDir(),
+-                        antHome + File.separator + myScript).toString();
++                        "@BINDIR@" + File.separator + myScript).toString();
+ 
+             // Build the command
+             File commandDir = workingDir;

diff --git a/ant-ant_d.patch b/ant-ant_d.patch
deleted file mode 100644 (file)
index abcf2bc..0000000
--- a/ant-ant_d.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- apache-ant-1.6.2/src/script/ant~   2004-07-16 08:56:50.000000000 +0100
-+++ apache-ant-1.6.2/src/script/ant    2004-11-05 15:14:23.000000000 +0000
-@@ -159,6 +159,28 @@
- # variable
- if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
-   LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
-+
-+  # If no optional jars have been specified then build the default list
-+  if [ -z "$OPT_JAR_LIST" ] ; then
-+    for file in /etc/ant.d/*; do
-+      if [ -f "$file" ]; then
-+        case "$file" in
-+        *~) ;;
-+        *#*) ;;
-+        *.rpmsave) ;;
-+        *.rpmnew) ;;
-+        *)
-+          for dep in `cat "$file"`; do
-+            case "$OPT_JAR_LIST" in
-+            *"$dep"*) ;;
-+            *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
-+            esac
-+          done
-+        esac
-+      fi
-+    done
-+  fi
-+
-   # If the user requested to try to add some other jars to the classpath
-   if [ -n "$OPT_JAR_LIST" ] ; then
-     _OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"