You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2010/02/10 14:14:10 UTC

svn commit: r908487 - /httpd/docs-build/trunk/build.bat

Author: wrowe
Date: Wed Feb 10 13:14:10 2010
New Revision: 908487

URL: http://svn.apache.org/viewvc?rev=908487&view=rev
Log:
Fix win32 docs build, use *ONLY* the bundled ant

Modified:
    httpd/docs-build/trunk/build.bat

Modified: httpd/docs-build/trunk/build.bat
URL: http://svn.apache.org/viewvc/httpd/docs-build/trunk/build.bat?rev=908487&r1=908486&r2=908487&view=diff
==============================================================================
--- httpd/docs-build/trunk/build.bat (original)
+++ httpd/docs-build/trunk/build.bat Wed Feb 10 13:14:10 2010
@@ -27,7 +27,7 @@
 REM   - set java stack size to 128 MB
 REM   - lower down verbosity (because the foreach task would be _very_ verbose
 REM     otherwise)
-REM   - lcp.bat is found in bin/ (NOT IN lib/ FOR 1.7 and later!!!)
+REM   - use only bundled ant!
 REM
 REM   (don't know whether this all works unter win9x; tested on win2k) --nd
 
@@ -40,6 +40,9 @@
 rem raise stack size ...
 set ANT_OPTS=-Xmx128m -mx128m
 
+set SAVE_ANT_HOME=%ANT_HOME%
+set ANT_HOME=
+
 rem set classpath
 set CLASSPATH=lib
 
@@ -76,7 +79,7 @@
 :checkJava
 set _JAVACMD=%JAVACMD%
 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%\lib\lcp.bat" %%i
 
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
@@ -101,6 +104,7 @@
 set LOCALCLASSPATH=
 set _JAVACMD=
 set ANT_CMD_LINE_ARGS=
+set ANT_HOME=%SAVE_ANT_HOME%
 
 if "%OS%"=="Windows_NT" @endlocal