curcuru 01/10/25 15:43:19
Modified: test build.bat build.xml
Log:
Pass PARSER_JAR through to the build.xml file and use it in
various classpaths; this allows easier testing of Crimson, etc.
Revision Changes Path
1.7 +6 -3 xml-xalan/test/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.bat 2001/10/12 20:56:28 1.6
+++ build.bat 2001/10/25 22:43:19 1.7
@@ -87,7 +87,7 @@
if "%JAVA_HOME%" == "" goto noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
-goto runAnt
+goto checkJikes
:noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=java
@@ -96,18 +96,21 @@
echo.
:checkJikes
+rem also pass along the selected parser to Ant
+set _ANT_OPTS=%ANT_OPTS% -Dparserjar=%_PARSER_JAR%
if not "%JIKESPATH%" == "" goto runAntWithJikes
:runAnt
-"%_JAVACMD%" %JAVA_OPTS% -classpath "%_ANT_CP%" -Dant.home="%_ANT_HOME%"
%ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %JAVA_OPTS% -classpath "%_ANT_CP%" -Dant.home="%_ANT_HOME%"
%_ANT_OPTS% org.apache.tools.ant.Main %ANT_CMD_LINE_ARGS%
goto end
:runAntWithJikes
-"%_JAVACMD%" %JAVA_OPTS% -classpath "%_ANT_CP%" -Dant.home="%_ANT_HOME%"
-Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %JAVA_OPTS% -classpath "%_ANT_CP%" -Dant.home="%_ANT_HOME%"
-Djikes.class.path=%JIKESPATH% %_ANT_OPTS% org.apache.tools.ant.Main
%ANT_CMD_LINE_ARGS%
:end
set _ANT_CP=
set _ANT_HOME=
+set _ANT_OPTS=
set _JAVACMD=
set _PARSER_JAR=
set ANT_CMD_LINE_ARGS=
1.22 +7 -6 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/10/23 20:28:04 1.21
+++ build.xml 2001/10/25 22:43:19 1.22
@@ -76,7 +76,7 @@
<!-- Various names/locations of dependent jars -->
<property name="xalan.jar" value="${xalan.build.dir}/xalan.jar"/>
- <property name="xerces.jar" value="${xalan.bin.dir}/xerces.jar"/>
+ <property name="parserjar" value="${xalan.bin.dir}/xerces.jar"/>
<property name="bsf.jar" value="${xalan.bin.dir}/bsf.jar"/>
<!-- The js.jar is for Javascript extensions tests; you must
get this .jar yourself. Feel free to reset the location.
@@ -120,14 +120,14 @@
<path id="compiletest.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
- <pathelement location="${xerces.jar}" />
+ <pathelement location="${parserjar}" />
</path>
<!-- Classpath used when running API tests -->
<path id="api.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
- <pathelement location="${xerces.jar}" />
+ <pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
</path>
@@ -135,7 +135,7 @@
<path id="conf.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
- <pathelement location="${xerces.jar}" />
+ <pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
</path>
@@ -188,6 +188,7 @@
description="Prepare timestamp, echo JARDIR for debugging">
<!-- Note this is case-sensitive, even on Windows! -->
<echo message="Your ==JARDIR== is set to ==${ENV.JARDIR}==" />
+ <echo message="Using parserjar ${parserjar}" />
<tstamp />
<!-- Note this is used when styling results files from tests to
html. -->
<available
classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison"
property="xalan-liaison" />
@@ -818,7 +819,7 @@
<pathelement location="${xalan.bin.dir}/java_cup.jar" />
<pathelement location="${xalan.bin.dir}/runtime.jar" />
<pathelement location="${testxsl.jar}" />
- <pathelement location="${xerces.jar}" />
+ <pathelement location="${parserjar}" />
<pathelement location="${xalan.jar}" />
</path>
<!-- xsltc-folk: are these the correct classpaths needed? -->
@@ -830,7 +831,7 @@
<pathelement location="${xalan.bin.dir}/java_cup.jar" />
<pathelement location="${xalan.bin.dir}/runtime.jar" />
<pathelement location="${testxsl.jar}" />
- <pathelement location="${xerces.jar}" />
+ <pathelement location="${parserjar}" />
<pathelement location="${xalan.jar}" />
<!-- Note addition of . to the classpath to enable loading
of translets; this needs more work and coordination
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
