From d84932f8b01015c89d4690485ec7986ab7f4e17c Mon Sep 17 00:00:00 2001 From: Sam Ruby Date: Sun, 6 Feb 2000 01:17:23 +0000 Subject: [PATCH] Restore support for > 9 parameters on exec calls on Windows git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267582 13f79535-47bb-0310-9956-ffa450edef68 --- src/bin/antRun.bat | 4 ---- src/main/org/apache/tools/ant/taskdefs/Exec.java | 16 ++++++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100755 src/bin/antRun.bat diff --git a/src/bin/antRun.bat b/src/bin/antRun.bat deleted file mode 100755 index 8216d1847..000000000 --- a/src/bin/antRun.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd %1 -echo %2 %3 %4 %5 %6 %7 %8 %9 -%2 %3 %4 %5 %6 %7 %8 %9 diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java index 4d6d68c1f..4793c6449 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exec.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java @@ -87,12 +87,16 @@ public class Exec extends Task { return; } - String ant = project.getProperty("ant.home"); - if (ant == null) throw new BuildException("Property 'ant.home' not found"); - - String antRun = project.resolveFile(ant + "/bin/antRun").toString(); - if (myos.toLowerCase().indexOf("windows") >= 0) antRun = antRun + ".bat"; - command = antRun + " " + project.resolveFile(dir) + " " + command; + if (myos.toLowerCase().indexOf("windows") >= 0) { + if (!dir.equals(".")) + command = "cmd /c cd " + project.resolveFile(dir) + " && " + command; + } else { + String ant = project.getProperty("ant.home"); + if (ant == null) throw new BuildException("Property 'ant.home' not found"); + String antRun = project.resolveFile(ant + "/bin/antRun").toString(); + + command = antRun + " " + project.resolveFile(dir) + " " + command; + } try { // show the command