Author: mrglavas
Date: Tue Nov 29 20:47:34 2005
New Revision: 349877
URL: http://svn.apache.org/viewcvs?rev=349877&view=rev
Log:
Addressing JIRA Issues #1118, #1119 and #1120:
http://issues.apache.org/jira/browse/XERCESJ-1118
http://issues.apache.org/jira/browse/XERCESJ-1119
http://issues.apache.org/jira/browse/XERCESJ-1120
Added a classpath to the typedef for xjavac task so that the build.xml
can be used without having to invoke build.bat/build.sh and made some
other minor improvements.
Modified:
xerces/java/trunk/build.xml
Modified: xerces/java/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/build.xml?rev=349877&r1=349876&r2=349877&view=diff
==============================================================================
--- xerces/java/trunk/build.xml (original)
+++ xerces/java/trunk/build.xml Tue Nov 29 20:47:34 2005
@@ -17,9 +17,22 @@
==================================================================== -->
<project default="usage" basedir=".">
-
- <!-- enable compilation under IBM JDK 1.4 -->
- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
+
+ <!-- Xerces Java directories -->
+ <property name="build.dir" value="./build"/>
+ <property name="data.dir" value="./data"/>
+ <property name="docs.dir" value="./docs"/>
+ <property name="samples.dir" value="./samples"/>
+ <property name="src.dir" value="./src"/>
+ <property name="tests.dir" value="./tests"/>
+ <property name="tools.dir" value="./tools"/>
+
+ <!-- enable compilation under JDK 1.4 and above -->
+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
+ <classpath>
+ <pathelement location="${tools.dir}/bin/xjavac.jar"/>
+ </classpath>
+ </taskdef>
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined
@@ -57,13 +70,6 @@
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
- <property name="src.dir" value="./src"/>
- <property name="tools.dir" value="./tools"/>
- <property name="docs.dir" value="./docs"/>
- <property name="data.dir" value="./data"/>
- <property name="samples.dir" value="./samples"/>
- <property name="tests.dir" value="./tests"/>
- <property name="tools.dir" value="./tools"/>
<property name="docs.book" value="${docs.dir}/docs-book.xml"/>
<property name="packages" value="org.*"/>
@@ -71,7 +77,6 @@
<property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
<property name="doc.generator.package"
value="${tools.dir}/stylebook-1.0-b2.jar"/>
- <property name="build.dir" value="./build"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
<property name="build.docs" value="${build.dir}/docs"/>
@@ -117,7 +122,7 @@
<echo message=" deprecatedjar --> generates the xerces.jar file"/>
<echo message=" tests --> compiles the tests source code"/>
<echo message=" deprecatedjars --> generates xerces.jar and samples jar"/>
- <echo message=" dtdjars --> generates xercesImpl containing no schema
support or WML/HTML DOM and xercesSamples & xmlParserAPIs jars"/>
+ <echo message=" dtdjars --> generates xercesImpl containing no schema
support or WML/HTML DOM and xercesSamples & xml-apis jars"/>
<echo message=" dvjar --> generates a Schema datatype jar"/>
<echo message=" pack-tools --> generates the tools distributions (zip and
tar.gz)"/>
<echo message=" pack-src --> generates the source distributions (zip and
tar.gz)"/>
@@ -837,7 +842,7 @@
</target>
<!-- =================================================================== -->
- <!-- Builds xercesImpl, xmlParserAPIs and sample jar files -->
+ <!-- Builds xercesImpl, xml-apis and sample jar files -->
<!-- =================================================================== -->
<target name="jars" depends="jar, sampjar">
<!-- support xml-commons APIs -->
@@ -867,7 +872,7 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the dtd implementation class package -->
+ <!-- Creates the dtd implementation class package -->
<!-- (that is, with no schema support or WML/HTML DOM.) -->
<!-- =================================================================== -->
<target name="dtdjar" depends="dtdcompile">
@@ -1017,7 +1022,7 @@
</target>
<!-- =================================================================== -->
- <!-- Builds xercesImpl (dtd), xmlParserAPIs, and sample jars -->
+ <!-- Builds xercesImpl (dtd), xml-apis, and sample jars -->
<!-- =================================================================== -->
<target name="dtdjars" depends="dtdjar, sampjar">
<!-- support xml-commons APIs -->
@@ -1151,8 +1156,8 @@
<arg value="${parser.version}"/>
<classpath>
<pathelement location="tests/conformance/utilities.jar"/>
- <pathelement location="build/xmlParserAPIs.jar"/>
- <pathelement location="build/xercesImpl.jar"/>
+ <pathelement location="${build.dir}/${jar.apis}"/>
+ <pathelement location="${build.dir}/${jar.parser}"/>
</classpath>
</java>
@@ -1164,12 +1169,10 @@
<arg value="${parser.version}"/>
<classpath>
<pathelement location="tests/conformance/utilities.jar"/>
- <pathelement location="build/xmlParserAPIs.jar"/>
- <pathelement location="build/xercesImpl.jar"/>
+ <pathelement location="${build.dir}/${jar.apis}"/>
+ <pathelement location="${build.dir}/${jar.parser}"/>
</classpath>
</java>
-
-
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
