git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272467 13f79535-47bb-0310-9956-ffa450edef68master
@@ -24,7 +24,7 @@ | |||||
* Alternately, this acknowledgment may appear in the software itself, | * Alternately, this acknowledgment may appear in the software itself, | ||||
* if and wherever such third-party acknowledgments normally appear. | * if and wherever such third-party acknowledgments normally appear. | ||||
* | * | ||||
* 4. The names "Crimson" and "Apache Software Foundation" must | |||||
* 4. The names "Xerces" and "Apache Software Foundation" must | |||||
* not be used to endorse or promote products derived from this | * not be used to endorse or promote products derived from this | ||||
* software without prior written permission. For written | * software without prior written permission. For written | ||||
* permission, please contact apache@apache.org. | * permission, please contact apache@apache.org. | ||||
@@ -49,7 +49,8 @@ | |||||
* | * | ||||
* This software consists of voluntary contributions made by many | * This software consists of voluntary contributions made by many | ||||
* individuals on behalf of the Apache Software Foundation and was | * individuals on behalf of the Apache Software Foundation and was | ||||
* originally based on software copyright (c) 1999, Sun Microsystems, Inc., | |||||
* http://www.sun.com. For more information on the Apache Software | |||||
* Foundation, please see <http://www.apache.org/>. | |||||
* originally based on software copyright (c) 1999, International | |||||
* Business Machines, Inc., http://www.ibm.com. For more | |||||
* information on the Apache Software Foundation, please see | |||||
* <http://www.apache.org/>. | |||||
*/ | */ |
@@ -26,7 +26,7 @@ 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 "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build | ||||
if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build | if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build | ||||
SET LOCALCLASSPATH=lib\crimson.jar | |||||
SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar | |||||
for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i | 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\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 | if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip | ||||
@@ -79,7 +79,7 @@ if [ -d "build" ] ; then | |||||
rm -r build | rm -r build | ||||
fi | fi | ||||
CLASSPATH=lib/crimson.jar:${CLASSPATH} | |||||
CLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar:${CLASSPATH} | |||||
DIRLIBS=lib/optional/*.jar | DIRLIBS=lib/optional/*.jar | ||||
for i in ${DIRLIBS} | for i in ${DIRLIBS} | ||||
@@ -13,7 +13,7 @@ echo Bootstrap FAILED | |||||
goto cleanup | goto cleanup | ||||
:runAnt | :runAnt | ||||
set LOCALCLASSPATH=lib\crimson.jar;bootstrap\lib\ant.jar | |||||
set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar;bootstrap\lib\ant.jar | |||||
for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i | for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i | ||||
set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH% | set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH% | ||||
set LOCALCLASSPATH= | set LOCALCLASSPATH= | ||||
@@ -21,7 +21,7 @@ if test ! -f bootstrap/lib/ant.jar -o ! -x bootstrap/bin/ant -o ! -x bootstrap/ | |||||
exit | exit | ||||
fi | fi | ||||
LOCALCLASSPATH=lib/crimson.jar | |||||
LOCALCLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar | |||||
# add in the dependency .jar files | # add in the dependency .jar files | ||||
DIRLIBS=lib/optional/*.jar | DIRLIBS=lib/optional/*.jar | ||||
for i in ${DIRLIBS} | for i in ${DIRLIBS} | ||||