|
Sorry if this patch is not quite right. I'm a
newbie.
-- Glen
Index:
src/main/org/apache/tools/ant/taskdefs/Exec.java
=================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v retrieving revision 1.10 diff -u -r1.10 Exec.java --- src/main/org/apache/tools/ant/taskdefs/Exec.java 2000/06/26 10:47:36 1.10 +++ src/main/org/apache/tools/ant/taskdefs/Exec.java 2000/06/27 12:11:53 @@ -94,12 +94,21 @@ if (myos.toLowerCase().indexOf("windows") >= 0) { if (!dir.equals(project.resolveFile("."))) - command = "cmd /c cd " + dir + " && " + command; + { + if (myos.toLowerCase().indexOf("98") >= 0) + { + String ant = project.getProperty("ant.home"); + if (ant == null) throw new BuildException("Property 'ant.home' not found", location); + String antRun = project.resolveFile(ant + "/bin/antRun.bat").toString(); + command = antRun + " " + dir + " " + command; + } + else + command = "cmd /c cd " + dir + " && " + command; + } } else { String ant = project.getProperty("ant.home"); if (ant == null) throw new BuildException("Property 'ant.home' not found", location); String antRun = project.resolveFile(ant + "/bin/antRun").toString(); - command = antRun + " " + dir + " " + command; } Index: bootstrap.bat =================================================================== RCS file: /home/cvspublic/jakarta-ant/bootstrap.bat,v retrieving revision 1.8 diff -u -r1.8 bootstrap.bat --- bootstrap.bat 2000/04/26 19:09:15 1.8 +++ bootstrap.bat 2000/06/27 12:24:11 @@ -40,6 +40,7 @@ echo ... Copying Required Files copy %TOOLS%\ant\taskdefs\*.properties
classes\org\apache\tools\ant\taskdefs
+copy src\dist\bin\antRun.bat bin\antRun.bat echo.
echo ... Building Ant Distribution Plus new file:
src/bin/antRun.bat
=================================================================== @echo off
cd %1
set CMD=%2 shift shift %CMD% %1 %2 %3 %4 %5 %6 %7 %8
%9
|
