diff options
| author | Conor MacNeill <conor@apache.org> | 2000-10-18 13:36:14 +0000 |
|---|---|---|
| committer | Conor MacNeill <conor@apache.org> | 2000-10-18 13:36:14 +0000 |
| commit | 626d7f944f819fa20c5d773eaa2729f7480c2f0a (patch) | |
| tree | fc0901fdd3edad503612e59f77c37145084c6b13 | |
| parent | 786f238656a7d7ed33844f5b01e51a0f10a8fd3f (diff) | |
| download | ant-626d7f944f819fa20c5d773eaa2729f7480c2f0a.tar.gz | |
Allow ant to be installed in a Windows directory containing spaces such as
c:\Program Files\ant
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268105 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | build.bat | 4 | ||||
| -rwxr-xr-x | src/bin/ant.bat | 12 |
2 files changed, 7 insertions, 9 deletions
@@ -11,11 +11,9 @@ call .\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9 goto cleanup :install_ant -set ANT_INSTALL="-Dant.install%REALANTHOME%" -call .\bin\ant.bat -Dant.install=%REALANTHOME% %1 %2 %3 %4 %5 %6 %7 %8 %9 +call .\bin\ant.bat -Dant.install="%REALANTHOME%" %1 %2 %3 %4 %5 %6 %7 %8 %9 rem clean up :cleanup set ANT_HOME=%REALANTHOME% set REALANTHOME= -set ANT_INSTALL= diff --git a/src/bin/ant.bat b/src/bin/ant.bat index 3866d190c..6f9ee7629 100755 --- a/src/bin/ant.bat +++ b/src/bin/ant.bat @@ -36,12 +36,12 @@ goto end :checkJava if "%JAVACMD%" == "" set JAVACMD=java -set LOCALCLASSPATH=%CLASSPATH% -for %%i in (%ANT_HOME%\lib\*.jar) do call %ANT_HOME%\bin\lcp.bat %%i +set LOCALCLASSPATH="%CLASSPATH%" +for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i" if "%JAVA_HOME%" == "" goto noJavaHome -if exist %JAVA_HOME%\lib\tools.jar call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\tools.jar -if exist %JAVA_HOME%\lib\classes.zip call %ANT_HOME%\bin\lcp.bat %JAVA_HOME%\lib\classes.zip +if exist "%JAVA_HOME%\lib\tools.jar" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\tools.jar" +if exist "%JAVA_HOME%\lib\classes.zip" call "%ANT_HOME%\bin\lcp.bat" "%JAVA_HOME%\lib\classes.zip" goto checkJikes :noJavaHome @@ -56,11 +56,11 @@ echo. if not "%JIKESPATH%" == "" goto runAntWithJikes :runAnt -%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS% +%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS% goto end :runAntWithJikes -%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS% +%JAVACMD% -classpath %LOCALCLASSPATH% -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS% :end set LOCALCLASSPATH= |