minchau 2004/10/14 20:08:36
Modified: test build.bat viewResults.bat viewResults.sh build.sh
build.xml
Log:
PR: XALANJ-1891
Submitted by: Brian Minchau
Reviewed by: Sarah McNamara
Changes to build.bat, build.sh, build.xml ... in the test directory to use
the new serializer.jar
Revision Changes Path
1.18 +2 -2 xml-xalan/test/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.bat,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.bat 27 Apr 2004 18:09:47 -0000 1.17
+++ build.bat 15 Oct 2004 03:08:36 -0000 1.18
@@ -59,7 +59,7 @@
:winNTStart
@setlocal
-set
classpath=..\java\bin\ant.jar;..\java\bin\xercesImpl.jar;..\java\bin\xalan.jar;..\java\bin\xml-apis.jar;%CLASSPATH%
+set
classpath=..\java\bin\ant.jar;..\java\bin\xercesImpl.jar;..\java\bin\xalan.jar;..\java\bin\serializer.jar;..\java\bin\xml-apis.jar;%CLASSPATH%
rem On NT/2K grab all arguments at once
@@ -112,7 +112,7 @@
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
xercesImpl.jar)! TBD -sc
-if not "%JARDIR%" == "" set
_CLASSPATH=%JARDIR%\xml-apis.jar;%JARDIR%\xercesImpl.jar;%JARDIR%\xalan.jar;%JARDIR%\testxsl.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%_ANT_HOME%\bin\ant.jar;%JARDIR%\Tidy.jar;%CLASSPATH%
+if not "%JARDIR%" == "" set
_CLASSPATH=%JARDIR%\xml-apis.jar;%JARDIR%\xercesImpl.jar;%JARDIR%\xalan.jar;%JARDIR%\serializer.jar;%JARDIR%\testxsl.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%_ANT_HOME%\bin\ant.jar;%JARDIR%\Tidy.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
1.8 +2 -2 xml-xalan/test/viewResults.bat
Index: viewResults.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/viewResults.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- viewResults.bat 27 Apr 2004 18:09:47 -0000 1.7
+++ viewResults.bat 15 Oct 2004 03:08:36 -0000 1.8
@@ -59,10 +59,10 @@
@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\bin\xml-apis.jar;..\java\build\xalan.jar;..\java\bin\bsf.jar;..\..\js.jar;%CLASSPATH%
+if "%JARDIR%" == "" set
TEST_CP=java\build\testxsl.jar;..\java\bin\%PARSER_JAR%;..\java\bin\xml-apis.jar;..\java\build\xalan.jar;..\java\build\serializer.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%\%PARSER_JAR%;%JARDIR%\xml-apis.jar;%JARDIR%\xalan.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%CLASSPATH%
+if not "%JARDIR%" == "" set
TEST_CP=%JARDIR%\testxsl.jar;%JARDIR%\%PARSER_JAR%;%JARDIR%\xml-apis.jar;%JARDIR%\xalan.jar;%JARDIR%\serializer.jar;%JARDIR%\bsf.jar;%JARDIR%\js.jar;%CLASSPATH%
@REM Set our output filename
if "%2" == "" set _OUTNAME=results.html
1.5 +3 -3 xml-xalan/test/viewResults.sh
Index: viewResults.sh
===================================================================
RCS file: /home/cvs/xml-xalan/test/viewResults.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- viewResults.sh 27 Apr 2004 18:09:47 -0000 1.4
+++ viewResults.sh 15 Oct 2004 03:08:36 -0000 1.5
@@ -34,8 +34,8 @@
exit 1
fi
-# Default to xerces.jar
-PARSER_JAR=xerces.jar
+# Default to xercesImpl.jar
+PARSER_JAR=xercesImpl.jar
# Check if we should use crimson.jar instead
if [ "$1" = "-crimson" ] ; then
@@ -46,7 +46,7 @@
# Set classpath for our use based on JARDIR
# prepend JARDIR-referenced jars to classpath
-TEST_CP="$JARDIR/$PARSER_JAR:$JARDIR/xalan.jar:$CLASSPATH"
+TEST_CP="$JARDIR/$PARSER_JAR:$JARDIR/xalan.jar:$JARDIR/serializer.jar:$CLASSPATH"
RIN=$1
shift
1.8 +5 -1 xml-xalan/test/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.sh 27 Apr 2004 18:09:47 -0000 1.7
+++ build.sh 15 Oct 2004 03:08:36 -0000 1.8
@@ -40,6 +40,10 @@
XML_APIS_JAR=../java/bin/xml-apis.jar
fi
+if [ "$SERIALIZER_JAR" = "" ]; then
+ SERIALIZER_JAR=../java/bin/serializer.jar
+fi
+
if [ "$ANT_HOME" = "" ] ; then
# try to find ANT
if [ -d /opt/ant ] ; then
@@ -86,7 +90,7 @@
fi
done
else
-
CLASSPATH=${CLASSPATH}${CLS_PATH_SEP}${_ANT_CP}${CLS_PATH_SEP}${PARSER_JAR}${CLS_PATH_SEP}${XML_APIS_JAR}
+
CLASSPATH=${CLASSPATH}${CLS_PATH_SEP}${_ANT_CP}${CLS_PATH_SEP}${PARSER_JAR}${CLS_PATH_SEP}${XML_APIS_JAR}${CLS_PATH_SEP}${SERIALIZER_JAR}
fi
if [ "$JAVA_HOME" != "" ] ; then
1.69 +10 -3 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- build.xml 27 Apr 2004 17:47:54 -0000 1.68
+++ build.xml 15 Oct 2004 03:08:36 -0000 1.69
@@ -93,6 +93,7 @@
<!-- Various names/locations of dependent jars -->
<property name="xalan.jar" value="${xalan.build.dir}/xalan.jar"/>
<property name="xsltc.jar" value="${xalan.build.dir}/xsltc.jar"/>
+ <property name="serializer.jar"
value="${xalan.build.dir}/serializer.jar"/>
<property name="xml-apis.jar" value="${xalan.bin.dir}/xml-apis.jar"/>
<property name="parserjar" value="${xalan.bin.dir}/xercesImpl.jar"/>
<property name="bcel.jar" value="${xalan.bin.dir}/BCEL.jar"/>
@@ -118,6 +119,7 @@
<pathelement location="${doclet.jar}" />
<pathelement location="${jtidy.jar}" />
<pathelement location="${xalan.jar}" />
+ <pathelement location="${serializer.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement path="${java.class.path}" />
@@ -146,6 +148,7 @@
<pathelement location="${xalan.jar}" />
<pathelement location="${xsltc.jar}" /> <!-- add this so we can
test the
separate jar
distribution -->
+ <pathelement location="${serializer.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${jtidy.jar}" />
@@ -155,6 +158,7 @@
<path id="api.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
+ <pathelement location="${serializer.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
@@ -165,6 +169,7 @@
<path id="conf.class.path">
<pathelement path="${java.class.path}" />
<pathelement location="${xalan.jar}" />
+ <pathelement location="${serializer.jar}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${testxsl.jar}" />
@@ -177,7 +182,8 @@
<path id="boot.class.path">
<pathelement location="${xalan.jar}" />
<pathelement location="${xsltc.jar}" /> <!-- add this so we can
test the
- separate jar
distribution -->
+ separate jar
distribution -->
+ <pathelement location="${serializer.jar}" />
<pathelement location="${java.class.path}" />
<pathelement location="${xml-apis.jar}" />
<pathelement location="${parserjar}" />
@@ -1390,6 +1396,7 @@
<!-- add xsltc.jar so we can test the separate jar distribution -->
<pathelement location="${xalan.build.dir}/xsltc.jar" />
+ <pathelement location="${serializer.jar}" />
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
