curcuru 00/12/27 13:11:11
Modified: test viewResults.bat Log: Defaults to Xalan-J 2.x now when JARDIR not set, just like runtest.bat Revision Changes Path 1.3 +24 -6 xml-xalan/test/viewResults.bat Index: viewResults.bat =================================================================== RCS file: /home/cvs/xml-xalan/test/viewResults.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- viewResults.bat 2000/11/09 08:48:30 1.2 +++ viewResults.bat 2000/12/27 21:11:10 1.3 @@ -20,17 +20,33 @@ if "%1" == "-?" goto usage @echo %0 beginning... [EMAIL PROTECTED] Trickery to guess appropriate location of java.exe program [EMAIL PROTECTED] -crimson: Use crimson.jar instead of xerces.jar [EMAIL PROTECTED] shift to get rid of -crimson arg; just pass rest of args along +set SAVED_JAVA_OPTS=%JAVA_OPTS% +if '%1' == '-crimson' set JAVA_OPTS=-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.crimson.jaxp.DocumentBuilderFactoryImpl -Dorg.xml.sax.driver=org.apache.crimson.jaxp.SAXParserFactoryImpl %JAVA_OPTS% +if '%1' == '-crimson' set PARSER_JAR=crimson.jar +if '%1' == '-crimson' shift + [EMAIL PROTECTED] Non-jview: Trickery to guess appropriate location of java.exe program if "%JAVA_HOME%" == "" set JAVA_EXE=java if not "%JAVA_HOME%" == "" set JAVA_EXE=%JAVA_HOME%\bin\java + +:dojardir [EMAIL PROTECTED] If PARSER_JAR blank, default to xerces +if "%PARSER_JAR%" == "" set PARSER_JAR=xerces.jar [EMAIL PROTECTED] Same logic as runtest.bat [EMAIL PROTECTED] @todo improve so all relevant batch/shell files use same logic -sc -if "%JARDIR%" == "" echo viewResults.bat must have JARDIR set! -if "%JARDIR%" == "" goto done [EMAIL PROTECTED] If JARDIR is blank, assume default Xalan-J 2.x locations [EMAIL PROTECTED] Note that this will probably fail miserably if you're trying [EMAIL PROTECTED] to test Xalan-J 1.x: in that case, you must set JARDIR [EMAIL PROTECTED] Note also that this assumes that crimson.jar is co-located [EMAIL PROTECTED] with the xerces.jar checked into Xalan-J 2.x [EMAIL PROTECTED] Note also that this assumes that js.jar is in the directory [EMAIL PROTECTED] above xml-xalan, for lack of a better place +if "%JARDIR%" == "" echo NOTE! JARDIR is not set, defaulting to Xalan-J 2.x! +if "%JARDIR%" == "" set TEST_CP=java\build\testxsl.jar;..\java\bin\%PARSER_JAR%;..\java\build\xalan.jar;..\java\bin\bsf.jar;..\..\js.jar;%CLASSPATH% @REM If JARDIR set, put those references first then default classpath -if not "%JARDIR%" == "" set TEST_CP=%JARDIR%\testxsl.jar;%JARDIR%\xerces.jar;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%CLASSPATH% +if not "%JARDIR%" == "" set TEST_CP=%JARDIR%\testxsl.jar;%JARDIR%\%PARSER_JAR%;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%CLASSPATH% @REM Set our output filename if "%2" == "" set ROUT=results.html @@ -47,4 +63,6 @@ set JAVA_EXE= set ROUT= set VSXSL= +set PARSER_JAR= +set JAVA_OPTS=%SAVED_JAVA_OPTS% :end
