diff --git a/bootstrap.bat b/bootstrap.bat index 218554c2b..0975050ea 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -38,7 +38,6 @@ if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap if "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build -SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xml-apis.jar for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip @@ -46,7 +45,7 @@ if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\c set TOOLS=src\main\org\apache\tools set CLASSDIR=build\classes -SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH% +SET CLASSPATH=%CLASSDIR%;src\main;%CLASSPATH% echo JAVA_HOME=%JAVA_HOME% echo JAVA=%JAVA% @@ -132,6 +131,5 @@ set ANT_HOME=%OLDANTHOME% set OLDJAVA= set OLDJAVAC= set BOOTOLDCLASSPATH= -set LOCALCLASSPATH= set OLDANTHOME= set TOOLS= diff --git a/bootstrap.sh b/bootstrap.sh index 22e550ddc..60b6ece03 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -97,8 +97,6 @@ if [ -d "build" ] ; then rm -r build fi -CLASSPATH=lib/xercesImpl.jar:lib/xml-apis.jar:${CLASSPATH} - DIRLIBS=lib/optional/*.jar for i in ${DIRLIBS} do @@ -166,4 +164,4 @@ echo ... Cleaning Up Build Directories rm -rf ${CLASSDIR} rm -rf bin -echo ... Done Bootstrapping Ant Distribution \ No newline at end of file +echo ... Done Bootstrapping Ant Distribution diff --git a/build.xml b/build.xml index a2b934c54..ca80ee986 100644 --- a/build.xml +++ b/build.xml @@ -730,7 +730,7 @@ + value="ant.jar xalan.jar"/> diff --git a/docs/manual/install.html b/docs/manual/install.html index 2f48ed222..84216f01a 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -183,25 +183,6 @@ Windows NT-platforms, OS/2 Warp, Novell Netware 6, OpenVMS and MacOS X. The platforms used most for development are, in no particular order, Linux, MacOS X, Windows XP and Unix; these are therefore that platforms that tend to work best. As of Ant1.7, Windows 9x is no longer supported. -

-To build and use Ant, you must have a JAXP-compliant XML parser installed and -available on your classpath, such as Xerces.

-

-The binary distribution of Ant includes the latest version of the -Apache Xerces2 XML parser. -Please see -http://java.sun.com/xml/ -for more information about JAXP. -If you wish to use a different JAXP-compliant parser, you should remove -xercesImpl.jar and xml-apis.jar -from Ant's lib directory. -

-You can then either put the JARs of your preferred parser into Ant's -lib directory or put the jars on the system classpath. -Some parts of Ant will fail if you use an old parser, especially one -that is not namespace-aware. In particular, avoid the Crimson parser.

- -

Tip: "ant -diagnostics" will list the XML parser used and its location.

For the current version of Ant, you will also need a JDK installed on diff --git a/docs/manual/platform.html b/docs/manual/platform.html index 5c4893c3a..a785992d2 100644 --- a/docs/manual/platform.html +++ b/docs/manual/platform.html @@ -172,15 +172,13 @@ it is treated like any other Unix.

To give the same level of sophisticated control as Ant's startup scripts on other platforms, it was decided to make the main ant startup on NetWare be via a Perl Script, "runant.pl". This is found in the bin directory (for instance - bootstrap\bin or dist\bin).

One important item of note is that you need to set up the following to run ant:

-