Browse Source

Made sure env vars are cleaned and CLASSPATH is not decorated with extra " characters. It is expected that if CLASSPATH is set that it is valid and thus the extra "'s are uneeded.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268570 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
10bd38594c
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      src/script/ant.bat

+ 2
- 1
src/script/ant.bat View File

@@ -55,7 +55,7 @@ goto end


:checkJava :checkJava
set _JAVACMD=%JAVACMD% set _JAVACMD=%JAVACMD%
set LOCALCLASSPATH="%CLASSPATH%"
set LOCALCLASSPATH=%CLASSPATH%
for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i" for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"


if "%JAVA_HOME%" == "" goto noJavaHome if "%JAVA_HOME%" == "" goto noJavaHome
@@ -85,6 +85,7 @@ goto end


:end :end
set LOCALCLASSPATH= set LOCALCLASSPATH=
set _JAVACMD=
set ANT_CMD_LINE_ARGS= set ANT_CMD_LINE_ARGS=


if not "%OS%"=="Windows_NT" goto mainEnd if not "%OS%"=="Windows_NT" goto mainEnd


Loading…
Cancel
Save