ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@locus.apache.org
Subject cvs commit: jakarta-ant/src/bin ant.bat
Date Wed, 18 Oct 2000 13:36:19 GMT
conor       00/10/18 06:36:16

  Modified:    .        build.bat
               src/bin  ant.bat
  Log:
  Allow ant to be installed in a Windows directory containing spaces such as
  c:\Program Files\ant
  
  Revision  Changes    Path
  1.13      +1 -3      jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.bat	2000/09/05 14:42:43	1.12
  +++ build.bat	2000/10/18 13:36:06	1.13
  @@ -11,11 +11,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=
  
  
  
  1.8       +6 -6      jakarta-ant/src/bin/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/bin/ant.bat,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ant.bat	2000/09/06 14:17:19	1.7
  +++ ant.bat	2000/10/18 13:36:14	1.8
  @@ -36,12 +36,12 @@
   :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 @@
   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=
  
  
  

Mime
View raw message