curcuru 01/05/22 09:07:23 Modified: test/java build.bat Log: Always use _underscore variables and unset them all to not conflict with runtest.bat Revision Changes Path 1.3 +16 -6 xml-xalan/test/java/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/xml-xalan/test/java/build.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.bat 2000/11/06 02:57:07 1.2 +++ build.bat 2001/05/22 16:07:04 1.3 @@ -33,29 +33,39 @@ if "%JAVA_HOME%" == "" set JAVA_EXE=java if not "%JAVA_HOME%" == "" set JAVA_EXE=%JAVA_HOME%\bin\java -set TANT_HOME=. +set _ANT_HOME=. [EMAIL PROTECTED] If PARSER_JAR blank, default to xerces +set _PARSER_JAR=%PARSER_JAR% +if "%_PARSER_JAR%" == "" set _PARSER_JAR=..\..\java\bin\xerces.jar [EMAIL PROTECTED] Set other jars by environment variables as well +if "%_XALAN_JAR%" == "" set _XALAN_JAR=..\..\java\build\xalan.jar +if "%_BSF_JAR%" == "" set _BSF_JAR=..\..\java\bin\bsf.jar + @REM If JARDIR blank, use the existing classpath first, so we pick up @REM any classes the user may have specified before default ones @REM Note that this could cause conflicts if the user only specified @REM some of the needed jars in the classpath, and then we add separate @REM copies of them later on. @REM HACK! Includes only Xalan-J 2.x build -if "%JARDIR%" == "" set TEST_CP=.\build;%classpath%;%TANT_HOME%\bin\ant.jar;..\..\java\bin\xerces.jar;..\..\java\build\xalan.jar;..\xml-xalan\bsf.jar +if "%JARDIR%" == "" set TEST_CP=.\build;%classpath%;%_ANT_HOME%\bin\ant.jar;%_PARSER_JAR%;%_XALAN_JAR%;%_BSF_JAR% @REM If JARDIR set, put those references first then default classpath @REM note that we still assume you're in xsl-test dir because of .\conf\Extend reference -if not "%JARDIR%" == "" set TEST_CP=.\build;%TANT_HOME%\bin\ant.jar;%JARDIR%\xerces.jar;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%classpath% +if not "%JARDIR%" == "" set TEST_CP=.\build;%_ANT_HOME%\bin\ant.jar;%JARDIR%\xerces.jar;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%classpath% :doant @REM Simply execute Ant to build it all -echo "%JAVA_EXE%" %JAVA_OPTS% -Dant.home=%TANT_HOME% -classpath "%TEST_CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 -"%JAVA_EXE%" %JAVA_OPTS% -Dant.home=%TANT_HOME% -classpath "%TEST_CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 +echo "%JAVA_EXE%" %JAVA_OPTS% -Dant.home=%_ANT_HOME% -classpath "%TEST_CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 +"%JAVA_EXE%" %JAVA_OPTS% -Dant.home=%_ANT_HOME% -classpath "%TEST_CP%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 goto done :done @echo %0 complete! set TEST_CP= set JAVA_EXE= -set TANT_HOME= +set _ANT_HOME= +set _PARSER_JAR= +set _XALAN_JAR= +set _BSF_JAR= :end
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
