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 2002/01/14 21:02:44 UTC
cvs commit: xml-xalan/test build.bat build.xml
curcuru 02/01/14 12:02:44
Modified: test build.bat build.xml
Log:
Enable building with Xerces 2.x, which requires xml-apis.jar be in the
default classpath; also update xml-apis.jar location to new bin dir
Minor update to conferr running - sets unneeded goldDir
Revision Changes Path
1.9 +6 -3 xml-xalan/test/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.bat 19 Nov 2001 22:53:44 -0000 1.8
+++ build.bat 14 Jan 2002 20:02:44 -0000 1.9
@@ -72,17 +72,19 @@
rem If PARSER_JAR blank, default to xerces in the xalan dir
if "%PARSER_JAR%" == "" set _PARSER_JAR=..\java\bin\xerces.jar
if not "%PARSER_JAR%" == "" set _PARSER_JAR=%PARSER_JAR%
+set _XML-APIS_JAR=%XML-APIS_JAR%
+if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=..\java\bin\xml-apis.jar
-rem If JARDIR is blank, then only add Ant and a PARSER_JAR to the
+rem If JARDIR is blank, then only add Ant, PARSER_JAR, and XML-APIS_JAR to the
rem classpath before running Ant - then within the Ant file, it
rem will add other .jars from default locations
-if "%JARDIR%" == "" set _CLASSPATH=%CLASSPATH%;%_ANT_HOME%\bin\ant.jar;%_PARSER_JAR%
+if "%JARDIR%" == "" set _CLASSPATH=%CLASSPATH%;%_ANT_HOME%\bin\ant.jar;%_XML-APIS_JAR%;%_PARSER_JAR%
rem Else if JARDIR is set, then put all Xalan-J 2.x required .jar files
rem in the classpath first from that one dir
rem Note: Does not yet support xsltc testing! TBD -sc
rem Note: Does not yet support using crimson from JARDIR (forces xerces.jar)! TBD -sc
-if not "%JARDIR%" == "" set _CLASSPATH=%JARDIR%\xerces.jar;%JARDIR%\xalan.jar;%JARDIR%\testxsl.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%_ANT_HOME%\bin\ant.jar;%CLASSPATH%
+if not "%JARDIR%" == "" set _CLASSPATH=%JARDIR%\xml-apis.jar;%JARDIR%\xerces.jar;%JARDIR%\xalan.jar;%JARDIR%\testxsl.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%_ANT_HOME%\bin\ant.jar;%CLASSPATH%
rem Attempt to automatically add system classes to very end of _CLASSPATH
if exist "%JAVA_HOME%\lib\tools.jar" set _CLASSPATH=%_CLASSPATH%;%JAVA_HOME%\lib\tools.jar
@@ -101,6 +103,7 @@
:checkJikes
rem also pass along the selected parser to Ant
+rem Note: we don't need to do this for xml-apis.jar
set _ANT_OPTS=%ANT_OPTS% -Dparserjar=%_PARSER_JAR%
if not "%JIKESPATH%" == "" goto runAntWithJikes
1.30 +6 -1 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 20 Dec 2001 18:21:21 -0000 1.29
+++ build.xml 14 Jan 2002 20:02:44 -0000 1.30
@@ -76,7 +76,7 @@
<!-- Various names/locations of dependent jars -->
<property name="xalan.jar" value="${xalan.build.dir}/xalan.jar"/>
- <property name="xml-apis.jar" value="${xalan.build.dir}/xml-apis.jar"/>
+ <property name="xml-apis.jar" value="${xalan.bin.dir}/xml-apis.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
@@ -98,6 +98,7 @@
<pathelement location="${doclet.jar}" />
<pathelement location="${xalan.jar}" />
<pathelement location="${xml-apis.jar}" />
+ <pathelement location="${parserjar}" />
<pathelement path="${java.class.path}" />
</path>
@@ -582,6 +583,10 @@
<param name="conferr.flavor" value="trax.systemId"/>
<param name="conferr.outputDir" value="${alltest.resultDir}/conferr"/>
<param name="conferr.logFile" value="${alltest.resultDir}/conferr/results.xml"/>
+ <!-- Note that conferr doesn't currently use gold files,
+ but we need to set the goldDir anyway for convenience
+ -->
+ <param name="conferr.goldDir" value="${alltest.resultDir}/conferr-gold"/>
</antcall>
<!-- Run various other sets of conf-like tests -->
<antcall target="perf">
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org