neilg 2003/01/17 08:53:20
Modified: java build.xml
Log:
compile against the classes in xml-apis.jar instead of the APIs in our CVS source
tree. Updated all build targets to get sources from the new xml-apis--src.tar.gz; now
we are ready to remove our APIs from CVS. Also updated the build script to copy DOM
and SAX license information into distributions.
Revision Changes Path
1.117 +63 -47 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.xml 16 Jan 2003 22:54:57 -0000 1.116
+++ build.xml 17 Jan 2003 16:53:20 -0000 1.117
@@ -38,7 +38,8 @@
<property name='parser_version' value='2_2_1'/>
<property name='deprecatedjar.parser' value='xerces.jar'/>
- <property name='jar.apis' value='xmlParserAPIs.jar'/>
+ <property name='jar.apis' value='xml-apis.jar'/>
+ <property name='deprecatedjar.apis' value='xmlParserAPIs.jar'/>
<property name='jar.parser' value='xercesImpl.jar'/>
<property name='jar.samples' value='xercesSamples.jar'/>
<property name='jar.dv' value='xercesDV.jar'/>
@@ -79,6 +80,8 @@
<property name="distsrc.dir"
value="${build.dir}/${parser.shortname}-${parser_version}"/>
<property name="disttools.dir" value="${build.dir}/tools"/>
<property name="distbin.dir"
value="${build.dir}/${parser.shortname}-${parser_version}"/>
+ <property name='src.apis.tgz' value="${tools.dir}/xml-apis--src.tar.gz"/>
+ <property name='src.apis.tar' value="${tools.dir}/xml-apis--src.tar"/>
<filter token="year" value="${year}"/>
<filter token="version" value="${parser.Version}"/>
@@ -102,8 +105,7 @@
<echo message=" jar --> generates the xercesImpl.jar file"/>
<echo message=" sampjar --> generates the xercesSamples.jar file"/>
- <echo message=" apijar --> generates the xmlParserAPIs.jar file"/>
- <echo message=" jars --> generates xercesImpl, xercesSamples &
xmlParserAPIs jars"/>
+ <echo message=" jars --> generates xercesImpl & xercesSamples jars"/>
<echo message=" jar-dom3 --> 'jar' + DOM Level 3 support"/>
<echo message=" sampjar-dom3 --> 'sampjar' + DOM Level 3 support"/>
<echo message=" apijar-dom3 --> 'apijar' + DOM Level 3 support."/>
@@ -176,7 +178,9 @@
<copy todir="${build.src}">
<fileset
dir="${src.dir}"
- includes="javax/**, org/**"
+ includes="org/apache/**
+ org/w3c/dom/ls/**
+ org/w3c/dom/html/HTMLDOMImplementation.java"
excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
**/v1/** **/v2/**
@@ -184,6 +188,22 @@
org/apache/xerces/dom3/ls/**">
</fileset>
</copy>
+
+ <!-- now deal with API's: -->
+ <gunzip src="${src.apis.tgz}"
+ dest="${src.apis.tar}"/>
+ <untar src="${src.apis.tar}" dest="${build.src}">
+ <patternset
+ includes="org/xml/sax/**
+ javax/xml/parsers/**
+ org/w3c/dom/*
+ org/w3c/dom/events/**
+ org/w3c/dom/html/**
+ org/w3c/dom/ranges/**
+ org/w3c/dom/traversal/**"
+ />
+ </untar>
+ <delete file="${src.apis.tar}"/>
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
@@ -206,7 +226,15 @@
deprecation="${deprecation}"
optimize="${optimize}"
includeAntRuntime="false"
- includeJavaRuntime="false"/>
+ includeJavaRuntime="false"
+ excludes="org/xml/sax/**
+ javax/xml/parsers/**
+ org/w3c/dom/*
+ org/w3c/dom/events/**
+ org/w3c/dom/html/**
+ org/w3c/dom/ranges/**
+ org/w3c/dom/traversal/**"
+ />
</target>
<!-- =================================================================== -->
@@ -238,24 +266,6 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the API class package, excluding DOM Level 3 -->
- <!-- =================================================================== -->
- <target name="apijar" depends="compile">
- <jar jarfile="${build.dir}/${jar.apis}"
- basedir="${build.dest}"
- compress="true"
- includes="org/xml/**, org/w3c/**, javax/**"
- excludes="org/w3c/dom/ls/**
- org/w3c/dom/xpath/**
- org/w3c/dom/DOMError.class
- org/w3c/dom/DOMErrorHandler.class
- org/w3c/dom/DOMImplementationSource.class
- org/w3c/dom/DOMImplementationRegistry.class
- org/w3c/dom/DOMLocator.class
- org/w3c/dom/UserDataHandler.class" />
- </target>
-
- <!-- =================================================================== -->
<!-- Compiles the samples -->
<!-- =================================================================== -->
<target name="samples" depends="compile">
@@ -267,7 +277,7 @@
</copy>
<xjavac srcdir="${build.samples}"
destdir="${build.dest}"
- classpath="${build.dir}/classes"
+ classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -336,18 +346,6 @@
<!-- Creates the API documentation -->
<!-- =================================================================== -->
<target name="javadocs" depends="prepare-src">
- <!--
- <mkdir dir="${build.javadocs}"/>
- <javadoc packagenames="${packages}"
- sourcepath="${build.src}"
- destdir="${build.javadocs}"
- author="true"
- version="true"
- use="true"
- windowtitle="${parser.Name} API"
- doctitle="${parser.Name}"
- bottom="${copyright}" />
- -->
<mkdir dir='${build.dir}/docs/javadocs/api'/>
<javadoc packagenames='javax.xml.parsers,org.w3c.*,org.xml.*'
locale='en_US'
@@ -415,7 +413,7 @@
<copy todir="${distsrc.dir}/src" >
<fileset
dir="${src.dir}"
- includes="**/Makefile, **/Makefile.incl, org/**, javax/**"
+ includes="org/**, dom3/**, javax/**"
excludes="**/CVS*, **/.#*, **/*.class
**/v1/** **/v2/**"
/>
@@ -443,8 +441,9 @@
/>
</copy>
- <!--<copy file="Makefile" tofile="${distsrc.dir}/Makefile"/>-->
<copy file="LICENSE" tofile="${distsrc.dir}/LICENSE"/>
+ <copy file="LICENSE-DOM.html" tofile="${distsrc.dir}/LICENSE-DOM.html"/>
+ <copy file="LICENSE-SAX.html" tofile="${distsrc.dir}/LICENSE-SAX.html"/>
<copy file="README" tofile="${distsrc.dir}/README"/>
<copy file="Readme.html" tofile="${distsrc.dir}/Readme.html"/>
<copy file="STATUS" tofile="${distsrc.dir}/STATUS"/>
@@ -478,7 +477,7 @@
<copy todir="${disttools.dir}" >
<fileset
dir="${tools.dir}"
- includes="**/*.txt, **/*.bat, **/*.jar"
+ includes="**/*.txt, **/*.bat, **/*.jar, **/*.tar.gz"
excludes="**/CVS*, **/.#*, **/*.class"
/>
</copy>
@@ -536,6 +535,8 @@
</copy>
<copy file="LICENSE" tofile="${distbin.dir}/LICENSE"/>
+ <copy file="LICENSE-DOM.html" tofile="${distbin.dir}/LICENSE-DOM.html"/>
+ <copy file="LICENSE-SAX.html" tofile="${distbin.dir}/LICENSE-SAX.html"/>
<copy file="Readme.html" tofile="${distbin.dir}/Readme.html"/>
<copy file="${build.dir}/${jar.samples}"
tofile="${distbin.dir}/${jar.samples}"/>
@@ -555,7 +556,9 @@
<!-- =================================================================== -->
<target name="pack-bin" depends="pack-bin-common, jars">
<copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/>
- <copy file="${build.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/>
+ <!-- support xml-commons APIs -->
+ <copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/>
+ <copy file="${tools.dir}/${jar.apis}"
tofile="${distbin.dir}/${deprecatedjar.apis}"/>
<zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip"
basedir="${build.dir}"
@@ -721,7 +724,10 @@
<!-- =================================================================== -->
<!-- Builds xercesImpl, xmlParserAPIs and sample jar files -->
<!-- =================================================================== -->
- <target name="jars" depends="jar, sampjar, apijar">
+ <target name="jars" depends="jar, sampjar">
+ <!-- support xml-commons APIs -->
+ <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/>
+ <copy file="${tools.dir}/${jar.apis}"
tofile="${build.dir}/${deprecatedjar.apis}"/>
</target>
<!-- =================================================================== -->
@@ -838,7 +844,10 @@
<!-- =================================================================== -->
<!-- Builds xercesImpl (dtd), xmlParserAPIs, and sample jars -->
<!-- =================================================================== -->
- <target name="dtdjars" depends="dtdjar, sampjar, apijar">
+ <target name="dtdjars" depends="dtdjar, sampjar">
+ <!-- support xml-commons APIs -->
+ <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/>
+ <copy file="${tools.dir}/${jar.apis}"
tofile="${build.dir}/${deprecatedjar.apis}"/>
</target>
<!-- =================================================================== -->
@@ -864,7 +873,10 @@
<!-- =================================================================== -->
<!-- Builds XML 1.1-enabled xercesImpl, xmlParserAPIs and sample jar files
-->
<!-- =================================================================== -->
- <target name="xml11jars" depends="xml11jar, sampjar, apijar">
+ <target name="xml11jars" depends="xml11jar, sampjar">
+ <!-- support xml-commons APIs -->
+ <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/>
+ <copy file="${tools.dir}/${jar.apis}"
tofile="${build.dir}/${deprecatedjar.apis}"/>
</target>
<!-- =================================================================== -->
@@ -1091,7 +1103,8 @@
deprecation="${deprecation}"
optimize="${optimize}"
includeAntRuntime="false"
- includeJavaRuntime="true"/>
+ includeJavaRuntime="true"
+ classpath="${tools.dir}/${jar.apis}"/>
</target>
<!-- =================================================================== -->
@@ -1115,7 +1128,7 @@
<xjavac srcdir="${build.samples}"
destdir="${build.dest}"
- classpath="${build.dir}/classes"
+ classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
@@ -1278,10 +1291,13 @@
<!-- Creates the API class package with DOM Level 3 -->
<!-- =================================================================== -->
<target name="apijar-dom3" depends="compile-dom3">
+ <copy file="${tools.dir}/${jar.apis}"
+ tofile="${build.dir}/dom3-${jar.apis}"/>
<jar jarfile="${build.dir}/dom3-${jar.apis}"
basedir="${build.dest}"
compress="true"
- includes="org/xml/**, org/w3c/**, javax/**" />
+ includes="org/xml/**, org/w3c/**"
+ update="yes"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
