You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by je...@locus.apache.org on 2000/11/30 01:21:12 UTC
cvs commit: xml-xerces/java build.bat build.sh build.xml
jeffreyr 00/11/29 16:21:11
Modified: java Tag: xerces_j_2 build.bat build.sh build.xml
Log:
Xerces 2 prep work
Revision Changes Path
No revision
No revision
1.2.2.1 +2 -3 xml-xerces/java/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.bat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build.bat 2000/06/05 19:18:37 1.2
+++ build.bat 2000/11/30 00:21:08 1.2.2.1
@@ -4,12 +4,11 @@
if "%JAVA_HOME%" == "" goto error
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;.\tools\ant.jar;.\tools\xerces-1.0.1.jar;.\tools\xalan-0.19.2.jar;.\tools\stylebook-1.0-b2.jar;.\tools\style-apachexml.jar;.\tools\xml.jar;
-set ANT_HOME=./tools
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;.\tools\ant.jar;.\tools\xerces.jar;.\tools\xalan.jar;.\tools\stylebook-1.0-b2.jar;.\tools\style-apachexml.jar;
echo Building with classpath %LOCALCLASSPATH%
echo Starting Ant...
-%JAVA_HOME%\bin\java.exe -Dant.home="%ANT_HOME%" -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+%JAVA_HOME%\bin\java.exe -Dant.home="./tools" -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
goto end
:error
1.4.2.1 +1 -1 xml-xerces/java/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.sh,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- build.sh 2000/06/05 22:03:45 1.4
+++ build.sh 2000/11/30 00:21:08 1.4.2.1
@@ -17,7 +17,7 @@
# if we're on a Windows box make it ;
uname | grep WIN && CLPATHSEP=\;
-LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xerces-1.0.1.jar${CLPATHSEP}./tools/xalan-0.19.2.jar${CLPATHSEP}./tools/stylebook-1.0-b2.jar${CLPATHSEP}./tools/style-apachexml.jar${CLPATHSEP}./tools/xml.jar"
+LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar${CLPATHSEP}${JAVA_HOME}/lib/classes.zip${CLPATHSEP}./tools/ant.jar${CLPATHSEP}./tools/xerces.jar${CLPATHSEP}./tools/xalan.jar${CLPATHSEP}./tools/stylebook-1.0-b2.jar${CLPATHSEP}./tools/style-apachexml.jar"
ANT_HOME=./tools
echo Building with classpath \"$LOCALCLASSPATH\"
1.14.2.3 +43 -20 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- build.xml 2000/11/14 00:50:50 1.14.2.2
+++ build.xml 2000/11/30 00:21:09 1.14.2.3
@@ -51,7 +51,7 @@
Copyright:
Copyright (c) 2000 The Apache Software Foundation.
- $Id: build.xml,v 1.14.2.2 2000/11/14 00:50:50 ericye Exp $
+ $Id: build.xml,v 1.14.2.3 2000/11/30 00:21:09 jeffreyr Exp $
==================================================================== -->
@@ -59,9 +59,10 @@
<target name="init">
<property name="name" value="xerces"/>
- <property name="Name" value="Xerces-J"/>
- <property name="version" value="1.1.0"/>
- <property name="version_postfix" value="_1_1_0"/>
+ <property name="Name" value="xerces-J"/>
+ <property name="version" value="2.0.0"/>
+ <property name="version_postfix" value=".2.0.0"/>
+ <property name="appendit" value="1_2_2"/>
<property name="year" value="1999-2000"/>
<property name="copyright" value="Copyright © ${year} Apache XML Project. All Rights Reserved."/>
@@ -78,7 +79,7 @@
<property name="tests.dir" value="./tests"/>
<property name="tools.dir" value="./tools"/>
<property name="docs.book" value="${docs.dir}/docs-book.xml"/>
- <property name="version.file" value="org/apache/xerces/impl/Version.java"/>
+ <property name="version.file" value="org/apache/xerces/framework/Version.java"/>
<property name="packages" value="org.*"/>
@@ -95,8 +96,8 @@
<property name="build.data" value="${build.dir}/data"/>
<property name="build.javadocs" value="${build.dir}/docs/apiDocs"/>
- <property name="distsrc.dir" value="${build.dir}/${Name}-src${version_postfix}"/>
- <property name="distbin.dir" value="${build.dir}/${Name}-bin${version_postfix}"/>
+ <property name="distsrc.dir" value="${build.dir}/${name}-${appendit}"/>
+ <property name="distbin.dir" value="${build.dir}/${name}-${appendit}"/>
<filter token="year" value="${year}"/>
<filter token="version" value="${version}"/>
@@ -152,14 +153,21 @@
<!-- create directories -->
<mkdir dir="${build.src}"/>
<mkdir dir="${build.dest}"/>
+ <mkdir dir="${build.dest}/META-INF"/>
+ <mkdir dir="${build.dest}/META-INF/services"/>
+ <copyfile src="src/org/apache/xerces/jaxp/javax.xml.parsers.DocumentBuilderFactory"
+ dest="${build.dest}/META-INF/services/javax.xml.parsers.DocumentBuilderFactory"/>
+
+ <copyfile src="src/org/apache/xerces/jaxp/javax.xml.parsers.SAXParserFactory"
+ dest="${build.dest}/META-INF/services/javax.xml.parsers.SAXParserFactory"/>
+
<!-- copy src files -->
<copydir src="${src.dir}" dest="${build.src}" includes="**/Makefile, **/Makefile.incl, javax/**, org/**"
excludes="**/classfiles_updated **/CVS* **/.#*
**/SchemaImporter.java **/RevalidatingDOMParser.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
- **/DTDImporter.java **/apache/wml/** **/apache/html/**
- org/w3c/dom/html/** org/apache/xml/**"/>
+ **/DTDImporter.java "/>
<deltree dir="${build.src}/whiteboard"/>
<!-- substitute tokens as needed -->
@@ -172,6 +180,7 @@
<!-- =================================================================== -->
<target name="compile" depends="prepare-src">
<javac srcdir="${build.src}"
+ excludes="**/RevalidatingDOMParser.java "
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -184,7 +193,7 @@
<target name="jar" depends="compile">
<jar jarfile="${build.dir}/${name}.jar"
basedir="${build.dest}"
- includes="org/**, javax/**" excludes="**/Makefile **/*.html"/>
+ includes="org/**, javax/**,META-INF/**"/>
</target>
<!-- =================================================================== -->
@@ -192,18 +201,17 @@
<!-- =================================================================== -->
<target name="samples" depends="jar">
<mkdir dir="${build.samples}"/>
- <!-- <copydir src="${samples.dir}" dest="${build.samples}" excludes="ui/**"/> -->
- <copydir src="${samples.dir}" dest="${build.samples}" excludes="**/DOMParserSaveEncoding.java **/TreeView.java **/TreeViewer.java"/>
+ <copydir src="${samples.dir}" dest="${build.samples}" />
<javac srcdir="${build.samples}"
destdir="${build.dest}"
- classpath="${build.dir}/${name}.jar:${build.samples}"
+ classpath="${build.dir}/${name}.jar"
debug="${debug}"/>
</target>
<!-- =================================================================== -->
<!-- Compiles the tests -->
<!-- =================================================================== -->
- <target name="tests" depends="jar">
+ <target name="tests" depends="samples">
<mkdir dir="${build.tests}"/>
<copydir src="${tests.dir}" dest="${build.tests}" />
<javac srcdir="${build.tests}"
@@ -218,7 +226,7 @@
<target name="sampjar" depends="samples">
<jar jarfile="${build.dir}/${name}Samples.jar"
basedir="${build.dest}"
- includes="dom/**,sax/**,ui/**"/>
+ includes="dom/**,sax/**,ui/**,util/**"/>
</target>
<!-- =================================================================== -->
@@ -260,19 +268,22 @@
<!-- =================================================================== -->
<target name="pack-src" depends="init">
<echo message="Building the source distribution files (zip,tar)"/>
+ <deltree dir="${distbin.dir}"/>
+
<mkdir dir="${distsrc.dir}"/>
<mkdir dir="${distsrc.dir}/src"/>
<mkdir dir="${distsrc.dir}/data"/>
<mkdir dir="${distsrc.dir}/docs"/>
<mkdir dir="${distsrc.dir}/samples"/>
- <copydir src="${src.dir}" dest="${distsrc.dir}/src" excludes="**/CVS*, **/.#*"
+ <copydir src="${src.dir}" dest="${distsrc.dir}/src" excludes="**/CVS*, **/.#*, **/*.class"
includes="**/Makefile, **/Makefile.incl, org/**, javax/**"/>
<copydir src="${data.dir}" dest="${distsrc.dir}/data" excludes="**/CVS*, **/.#*"/>
<copydir src="${docs.dir}" dest="${distsrc.dir}/docs"
excludes="**/CVS*, **/*.#*, pdf/**, html/**, **/apiDocs*"/>
<copydir src="${samples.dir}" dest="${distsrc.dir}/samples" excludes="**/CVS*, **/*.#*"/>
+ <copyfile src="Makefile" dest="${distsrc.dir}/Makefile"/>
<copyfile src="LICENSE" dest="${distsrc.dir}/LICENSE"/>
<copyfile src="README" dest="${distsrc.dir}/README"/>
<copyfile src="Readme.html" dest="${distsrc.dir}/Readme.html"/>
@@ -283,9 +294,10 @@
<copyfile src="${basedir}/build.bat" dest="${distsrc.dir}/build.bat" />
<zip zipfile="${build.dir}/${Name}-src${version_postfix}.zip" basedir="${build.dir}"
- includes="${Name}-src${version_postfix}/**"/>
+ includes="${name}-${appendit}/**" excludes="*.class"/>
+
<tar tarfile="${build.dir}/${Name}-src${version_postfix}.tar" basedir="${build.dir}"
- includes="${Name}-src${version_postfix}/**"/>
+ includes="${name}-${appendit}/**" excludes="*.class"/>
<gzip zipfile="${build.dir}/${Name}-src${version_postfix}.tar.gz"
src="${build.dir}/${Name}-src${version_postfix}.tar" />
</target>
@@ -296,12 +308,15 @@
<target name="pack-bin" depends="jar, sampjar, javadocs, docs">
<echo message="Building the binary distribution files (zip,tar)"/>
+ <deltree dir="${distbin.dir}"/>
<mkdir dir="${distbin.dir}"/>
<mkdir dir="${distbin.dir}/data"/>
<mkdir dir="${distbin.dir}/docs"/>
<mkdir dir="${distbin.dir}/docs/html"/>
<mkdir dir="${distbin.dir}/docs/apiDocs"/>
+ <mkdir dir="${distsrc.dir}/samples"/>
+
<copydir src="${data.dir}" dest="${distbin.dir}/data" excludes="**/CVS*, **/*.#*"/>
<copydir src="${build.docs}" dest="${distbin.dir}/docs/html"/>
<copydir src="${build.javadocs}" dest="${distbin.dir}/docs/apiDocs"/>
@@ -312,10 +327,13 @@
<copyfile src="LICENSE" dest="${distbin.dir}/LICENSE"/>
<copyfile src="Readme.html" dest="${distbin.dir}/Readme.html"/>
+ <copydir src="${samples.dir}" dest="${distsrc.dir}/samples" excludes="**/CVS*, **/*.#*"/>
+
+
<zip zipfile="${build.dir}/${Name}-bin${version_postfix}.zip" basedir="${build.dir}"
- includes="${Name}-bin${version_postfix}/**"/>
+ includes="${name}-${appendit}/**" excludes="*.class"/>
<tar tarfile="${build.dir}/${Name}-bin${version_postfix}.tar" basedir="${build.dir}"
- includes="${Name}-bin${version_postfix}/**"/>
+ includes="${name}-${appendit}/**" excludes="*.class"/>
<gzip zipfile="${build.dir}/${Name}-bin${version_postfix}.tar.gz"
src="${build.dir}/${Name}-bin${version_postfix}.tar" />
@@ -331,6 +349,11 @@
<java fork="yes"
classpath="${build.dir}/${name}Samples.jar:${build.dir}/${name}.jar;"
classname="sax.SAXCount"
+ args="${data.dir}/personal.xml"/>
+ <echo message="Running SAX2Count ..." />
+ <java fork="yes"
+ classpath="${build.dir}/${name}Samples.jar:${build.dir}/${name}.jar;"
+ classname="sax.SAX2Count"
args="${data.dir}/personal.xml"/>
<echo message="Running SAXWriter ..." />
<java fork="yes"