You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/06/03 01:55:06 UTC
cvs commit: xml-xerces/java/src/javax/xml/parsers Makefile
lehors 00/06/02 16:55:06
Modified: java Makefile build.xml
java/src Makefile Makefile.incl
Added: java/src/javax Makefile
java/src/javax/xml Makefile
java/src/javax/xml/parsers Makefile
Log:
integrated JAXP to Xerces based on James Duncan authorization.
See http://xml-archive.webweaving.org/xml-archive-xerces-j-dev/0545.html
Revision Changes Path
1.19 +2 -3 xml-xerces/java/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xerces/java/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile 2000/05/23 20:27:32 1.18
+++ Makefile 2000/06/02 23:55:00 1.19
@@ -48,9 +48,8 @@
$(JAR) cvfM ${BINZIPFILE} xerces-${PRODUCTVERSION}
$(MV) xerces-${PRODUCTVERSION} bin
-package_src:: ./source/src/Makefile
-./source/src/Makefile: ./src/classfiles_updated
-
+package_src:: ${SRCZIPFILE}
+${SRCZIPFILE}: ./src/classfiles_updated
@echo Building the source release package
${MAKE} -C src package_src
${CP} -r data source
1.13 +17 -2 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2000/06/02 18:02:05 1.12
+++ build.xml 2000/06/02 23:55:00 1.13
@@ -51,7 +51,7 @@
Copyright:
Copyright (c) 2000 The Apache Software Foundation.
- $Id: build.xml,v 1.12 2000/06/02 18:02:05 abagchi Exp $
+ $Id: build.xml,v 1.13 2000/06/02 23:55:00 lehors Exp $
==================================================================== -->
@@ -75,6 +75,7 @@
<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="version.file" value="org/apache/xerces/framework/Version.java"/>
@@ -90,6 +91,7 @@
<property name="build.dest" value="${build.dir}/classes"/>
<property name="build.docs" value="${build.dir}/docs/html"/>
<property name="build.samples" value="${build.dir}/samples"/>
+ <property name="build.tests" value="${build.dir}/tests"/>
<property name="build.data" value="${build.dir}/data"/>
<property name="build.javadocs" value="${build.dir}/docs/apiDocs"/>
@@ -118,6 +120,7 @@
<echo message=" compile --> compiles the source code"/>
<echo message=" jar --> generates the xerces.jar file"/>
<echo message=" samples --> compiles the samples source code"/>
+ <echo message=" tests --> compiles the tests source code"/>
<echo message=" sampjar --> generates the xercesSamples.jar file"/>
<echo message=" jars --> generates the xerces and xercesSamples jar files"/>
<echo message=" docs --> generates the HTML documentation"/>
@@ -196,6 +199,18 @@
</target>
<!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="jar">
+ <mkdir dir="${build.tests}"/>
+ <copydir src="${tests.dir}" dest="${build.tests}" />
+ <javac srcdir="${build.tests}"
+ destdir="${build.dest}"
+ classpath="${build.dir}/${name}.jar"
+ debug="${debug}"/>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Creates the samples package -->
<!-- =================================================================== -->
<target name="sampjar" depends="samples">
@@ -250,7 +265,7 @@
<mkdir dir="${distsrc.dir}/samples"/>
<copydir src="${src.dir}" dest="${distsrc.dir}/src" excludes="**/CVS*, **/.#*"
- includes="**/Makefile, **/Makefile.incl, org/**"/>
+ 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*"/>
1.24 +22 -2 xml-xerces/java/src/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 2000/05/22 17:43:24 1.23
+++ Makefile 2000/06/02 23:55:01 1.24
@@ -1,7 +1,7 @@
# Makefile for directory .
TARGETS =
-DIRS = org
+DIRS = org javax
TOP = ..
include $(TOP)/src/Makefile.incl
@@ -133,10 +133,15 @@
${MKDIR} ../class/org/apache/wml/dom
${CP} ../src/org/apache/wml/dom/*.class ../class/org/apache/wml/dom
+#-src/javax/xml/parsers
+ ${MKDIR} ../class/javax/xml/parsers
+ ${CP} ../src/javax/xml/parsers/*.class ../class/javax/xml/parsers
+
#make the first jar file
echo ${PRODUCTVERSION}> ../class/Xerces_Ver_${PRODUCTVERSION}.info
- cd ../class;$(JAR) c0vf ../bin/${JARFILE} *.info org; cd ../src
+ cd ../class;$(JAR) c0vf ../bin/${JARFILE} *.info org javax; cd ../src
+
###################################
#copy the .class files unser samples
samples: ../bin/${SAMPLESJARFILE}
@@ -301,6 +306,10 @@
${MKDIR} ../source/src/org/xml/sax/ext
${CP} ../src/org/xml/sax/ext/*.java ../source/src/org/xml/sax/ext
+#-src/javax/xml/parsers
+ ${MKDIR} ../source/src/javax/xml/parsers
+ ${CP} ../src/javax/xml/parsers/*.java ../source/src/javax/xml/parsers
+
###################################
#copy the .java and .dtd files unser samples
@@ -458,6 +467,17 @@
#-src/org/xml
${CP} ../src/org/xml/Makefile ../source/src/org/xml
+
+
+#-src/javax/xml/parsers
+ ${CP} ../src/javax/xml/parsers/Makefile ../source/src/javax/xml/parsers
+
+#-src/javax/xml
+ ${CP} ../src/javax/xml/Makefile ../source/src/javax/xml
+
+#-src/javax
+ ${CP} ../src/javax/Makefile ../source/src/javax
+
###################################
#copy the Makefiles under samples
1.29 +2 -1 xml-xerces/java/src/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/Makefile.incl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.incl 2000/05/19 20:37:24 1.28
+++ Makefile.incl 2000/06/02 23:55:02 1.29
@@ -60,7 +60,8 @@
org.w3c.dom.html \
org.xml.sax \
org.xml.sax.ext \
- org.xml.sax.helpers
+ org.xml.sax.helpers \
+ javax.xml.parsers
BINZIPFILE = ${PRODUCTNAME}-J-bin.${PRODUCTVERSION_DOT}.zip
1.1 xml-xerces/java/src/javax/Makefile
Index: Makefile
===================================================================
# Makefile for directory ./javax
TARGETS =
DIRS = xml
TOP = ../..
include $(TOP)/src/Makefile.incl
1.1 xml-xerces/java/src/javax/xml/Makefile
Index: Makefile
===================================================================
# Makefile for directory ./javax/xml
TARGETS =
DIRS = parsers
TOP = ../../..
include $(TOP)/src/Makefile.incl
1.1 xml-xerces/java/src/javax/xml/parsers/Makefile
Index: Makefile
===================================================================
# Makefile for directory ./javax/xml
TARGETS =\
DocumentBuilder.class\
DocumentBuilderFactory.class\
FactoryConfigurationError.class\
ParserConfigurationException.class\
SAXParser.class\
SAXParserFactory.class
DIRS =
TOP = ../../../..
include $(TOP)/src/Makefile.incl