You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mc...@apache.org on 2005/07/19 18:24:16 UTC
cvs commit: xml-xalan/test build.xml build.sh build.bat
mcnamara 2005/07/19 09:24:16
Modified: test build.xml build.sh build.bat
Log:
Updates to the build scripts and Ant build.xml file to accomodate the
restructuring of the tools and runtime libraries in xml-xalan/java/tools and
xml-xalan/java/lib.
This change was reviewed and approved in XALANJ-2170 by Christine Li.
Revision Changes Path
1.75 +13 -11 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build.xml 29 Jun 2005 03:15:00 -0000 1.74
+++ build.xml 19 Jul 2005 16:24:16 -0000 1.75
@@ -68,6 +68,7 @@
<property name="test.src.dir" value="java/src"/>
<property name="test.root" value="org/apache/qetest/"/>
<property name="test.dir" value="${test.src.dir}/${test.root}"/>
+ <property name="test.tools.dir" value="./tools"/>
<property name="test.build.dir" value="java/build"/>
<property name="test.build.docs" value="${test.build.dir}/docs"/>
<property name="test.build.apidocs" value="${test.build.docs}/apidocs"/>
@@ -85,7 +86,8 @@
<!-- Specific locations related to Xalan code, which should be in a sister tree to us -->
<property name="xalan.relpath" value="../java"/>
- <property name="xalan.bin.dir" value="${xalan.relpath}/bin"/>
+ <property name="xalan.lib.dir" value="${xalan.relpath}/lib"/>
+ <property name="xalan.tools.dir" value="${xalan.relpath}/tools"/>
<property name="xalan.build.dir" value="${xalan.relpath}/build"/>
<property name="xalan.xdocs.dir" value="${xalan.relpath}/xdocs"/>
<property name="xalan.generator.styletargz" value="${xalan.xdocs.dir}/xml-site-style.tar.gz"/>
@@ -96,12 +98,12 @@
value="${xalan.build.dir}/xalan-unbundled.jar"/>
<property name="xsltc.jar" value="${xalan.build.dir}/xsltc.jar"/>
<property name="ser.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"/>
+ <property name="xml-apis.jar" value="${xalan.lib.dir}/xml-apis.jar"/>
+ <property name="parserjar" value="${xalan.lib.dir}/xercesImpl.jar"/>
+ <property name="bcel.jar" value="${xalan.lib.dir}/BCEL.jar"/>
<!-- JTidy is used by the XSLTC comparator -->
- <property name="jtidy.jar" value="${xalan.bin.dir}/Tidy.jar"/>
+ <property name="jtidy.jar" value="${test.tools.dir}/Tidy.jar"/>
<!-- The js.jar is for Javascript extensions tests; you must get this .jar yourself.
Feel free to reset the location. -->
@@ -116,8 +118,8 @@
<property name="bsf.jar" value="../../bsf.jar"/>
<!-- Documentation-specific files and locations -->
- <property name="stylebook.jar" value="${xalan.bin.dir}/stylebook-1.0-b3_xalan-2.jar"/>
- <property name="doclet.jar" value="${xalan.bin.dir}/xalan2jdoc.jar"/>
+ <property name="stylebook.jar" value="${xalan.tools.dir}/stylebook-1.0-b3_xalan-2.jar"/>
+ <property name="doclet.jar" value="${xalan.tools.dir}/xalan2jdoc.jar"/>
<property name="test.xdocs.dir" value="java/xdocs"/>
<property name="test.generator.styletar" value="${test.xdocs.dir}/xml-site-style.tar"/>
<property name="test.xdocs.book" value="${test.xdocs.dir}/sources/xalantest.xml"/>
@@ -1559,7 +1561,7 @@
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
- <pathelement location="${xalan.bin.dir}/Tidy.jar" />
+ <pathelement location="${jtidy.jar}" />
</path>
<path id="xsltc.compile.class.path">
<pathelement path="${java.class.path}" />
@@ -1571,7 +1573,7 @@
<pathelement location="${testxsl.jar}" />
<pathelement location="${parserjar}" />
<pathelement location="${xml-apis.jar}" />
- <pathelement location="${xalan.bin.dir}/Tidy.jar" />
+ <pathelement location="${jtidy.jar}" />
<!-- Note addition of . to the classpath to enable loading
of translets; this needs more work and coordination
with tests and translet output dirs.
1.9 +4 -4 xml-xalan/test/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.sh 15 Oct 2004 03:08:36 -0000 1.8
+++ build.sh 19 Jul 2005 16:24:16 -0000 1.9
@@ -33,15 +33,15 @@
# If PARSER_JAR is not set, default to xercesImpl.jar
if [ "$PARSER_JAR" = "" ] ; then
- PARSER_JAR=../java/bin/xercesImpl.jar
+ PARSER_JAR=../java/lib/xercesImpl.jar
fi
if [ "$XML_APIS_JAR" = "" ]; then
- XML_APIS_JAR=../java/bin/xml-apis.jar
+ XML_APIS_JAR=../java/lib/xml-apis.jar
fi
if [ "$SERIALIZER_JAR" = "" ]; then
- SERIALIZER_JAR=../java/bin/serializer.jar
+ SERIALIZER_JAR=../java/lib/serializer.jar
fi
if [ "$ANT_HOME" = "" ] ; then
@@ -68,7 +68,7 @@
# add in the dependency .jar files (copied from ant)
DIRLIBS=${ANT_HOME}/lib/*.jar
-_ANT_CP=$ANT_HOME/bin/ant.jar
+_ANT_CP=$ANT_HOME/tools/ant.jar
for i in ${DIRLIBS}
do
# if the directory is empty, then it will return the input string
1.19 +5 -5 xml-xalan/test/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.bat,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.bat 15 Oct 2004 03:08:36 -0000 1.18
+++ build.bat 19 Jul 2005 16:24:16 -0000 1.19
@@ -59,7 +59,7 @@
:winNTStart
@setlocal
-set classpath=..\java\bin\ant.jar;..\java\bin\xercesImpl.jar;..\java\bin\xalan.jar;..\java\bin\serializer.jar;..\java\bin\xml-apis.jar;%CLASSPATH%
+set classpath=..\java\tools\ant.jar;..\java\lib\xercesImpl.jar;..\java\lib\xalan.jar;..\java\lib\serializer.jar;..\java\lib\xml-apis.jar;%CLASSPATH%
rem On NT/2K grab all arguments at once
@@ -98,21 +98,21 @@
rem Note: classpath handling is special for testing Xalan
rem If PARSER_JAR blank, default to xerces in the xalan dir
-if "%PARSER_JAR%" == "" set _PARSER_JAR=..\java\bin\xercesImpl.jar
+if "%PARSER_JAR%" == "" set _PARSER_JAR=..\java\lib\xercesImpl.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
+if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=..\java\lib\xml-apis.jar
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;%_XML-APIS_JAR%;%_PARSER_JAR%
+if "%JARDIR%" == "" set _CLASSPATH=%CLASSPATH%;%_ANT_HOME%\tools\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 xercesImpl.jar)! TBD -sc
-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%
+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%\tools\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
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org