You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by cu...@apache.org on 2001/05/22 18:06:32 UTC
cvs commit: xml-xalan/test runtest.bat
curcuru 01/05/22 09:06:27
Modified: test runtest.bat
Log:
Always use _underscore variables and unset them all to not conflict with runtest.bat
Revision Changes Path
1.8 +11 -3 xml-xalan/test/runtest.bat
Index: runtest.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/runtest.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- runtest.bat 2001/01/29 21:46:15 1.7
+++ runtest.bat 2001/05/22 16:06:03 1.8
@@ -56,7 +56,12 @@
:dojardir
@REM If PARSER_JAR blank, default to xerces
-if "%PARSER_JAR%" == "" set PARSER_JAR=xerces.jar
+set _PARSER_JAR=%PARSER_JAR%
+if "%_PARSER_JAR%" == "" set _PARSER_JAR=..\java\bin\xerces.jar
+@REM 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
+if "%_JS_JAR%" == "" set _JS_JAR=..\..\js.jar
@REM If JARDIR is blank, assume default Xalan-J 2.x locations
@REM Note that this will probably fail miserably if you're trying
@@ -66,7 +71,7 @@
@REM Note also that this assumes that js.jar is in the directory
@REM 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%
+if "%JARDIR%" == "" set TEST_CP=java\build\testxsl.jar;%_PARSER_JAR%;%_XALAN_JAR%;%_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%\%PARSER_JAR%;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%CLASSPATH%
@@ -92,7 +97,10 @@
set TEST_CP=
set JAVA_EXE=
set CMDCP=
-set PARSER_JAR=
+set _PARSER_JAR=
+set _XALAN_JAR=
+set _BSF_JAR=
+set _JS_JAR=
set JAVA_OPTS=%SAVED_JAVA_OPTS%
if '%END_PKG%' == 'xsl' set END_PKG=
:end
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org