]> git.pld-linux.org Git - packages/ant.git/blob - ant-antRun.patch
- BR: xml-commons-resolver when --with apache_resolver
[packages/ant.git] / 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                              + "found", getLocation());
6                      }
7  
8 -                    String antRun = getProject().resolveFile(ant + "/bin/antRun.bat").toString();
9 +                    String antRun = getProject().resolveFile("@BINDIR@/antRun.bat").toString();
10                      command = antRun + " " + dir + " " + command;
11                  }
12              }
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              }
18          } else {
19              // Generic
20 -            shellLauncher = new ScriptCommandLauncher("bin/antRun",
21 +            shellLauncher = new ScriptCommandLauncher("antRun",
22                  new CommandLauncher());
23          }
24      }
25 @@ -1038,7 +1038,7 @@
26              }
27              String antRun =
28                  FILE_UTILS.resolveFile(project.getBaseDir(),
29 -                        antHome + File.separator + myScript).toString();
30 +                        "@BINDIR@" + File.separator + myScript).toString();
31  
32              // Build the command
33              File commandDir = workingDir;
This page took 0.031592 seconds and 3 git commands to generate.