curcuru 02/01/18 07:26:13
Modified: java build.bat build.sh build.xml
Log:
Update to use Xerces 2.x xercesImpl.jar file;
build.xml also remove other references to todo.html, "todo" target, etc.
Revision Changes Path
1.12 +2 -2 xml-xalan/java/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.bat 11 Jan 2002 19:19:34 -0000 1.11
+++ build.bat 18 Jan 2002 15:26:13 -0000 1.12
@@ -5,7 +5,7 @@
rem - you should set JAVA_HOME
rem - you can set ANT_HOME if you use your own Ant install
rem - JAVA_OPTS is added to the java command line
-rem - PARSER_JAR may be set to use alternate parser
(default:bin\xerces.jar)
+rem - PARSER_JAR may be set to use alternate parser
(default:bin\xercesImpl.jar)
echo.
echo Xalan-J 2.x Build
echo -------------
@@ -34,7 +34,7 @@
set _ANT_JAR=%ANT_JAR%
if "%_ANT_JAR%" == "" set _ANT_JAR=bin\ant.jar
set _PARSER_JAR=%PARSER_JAR%
-if "%_PARSER_JAR%" == "" set _PARSER_JAR=bin\xerces.jar
+if "%_PARSER_JAR%" == "" set _PARSER_JAR=bin\xercesImpl.jar
set _XML-APIS_JAR=%XML-APIS_JAR%
if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=bin\xml-apis.jar
1.7 +1 -1 xml-xalan/java/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 11 Jan 2002 19:19:34 -0000 1.6
+++ build.sh 18 Jan 2002 15:26:13 -0000 1.7
@@ -21,7 +21,7 @@
ANT_JAR=./bin/ant.jar
fi
if [ "$PARSER_JAR" = "" ] ; then
- PARSER_JAR=./bin/xerces.jar
+ PARSER_JAR=./bin/xercesImpl.jar
fi
if [ "$XML-APIS_JAR" = "" ] ; then
1.153 +14 -26 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- build.xml 17 Jan 2002 18:57:13 -0000 1.152
+++ build.xml 18 Jan 2002 15:26:13 -0000 1.153
@@ -41,7 +41,7 @@
Copyright:
Copyright (c) 1999-2001 The Apache Software Foundation.
- $Id: build.xml,v 1.152 2002/01/17 18:57:13 dleslie Exp $
+ $Id: build.xml,v 1.153 2002/01/18 15:26:13 curcuru Exp $
==================================================================== -->
<project name="Xalan" default="jar" basedir=".">
@@ -58,7 +58,7 @@
-->
<property name="xmlapis.jar.name" value="xml-apis.jar"/>
<property name="xmlapis.jar" value="${bin.dir}/${xmlapis.jar.name}"/>
- <property name="parser.jar.name" value="xerces.jar"/>
+ <property name="parser.jar.name" value="xercesImpl.jar"/>
<property name="parser.jar" value="${bin.dir}/${parser.jar.name}"/>
<property name="bsf.jar.name" value="bsf.jar"/>
<property name="bsf.jar" value="${bin.dir}/${bsf.jar.name}"/>
@@ -114,7 +114,10 @@
<property name="dist.dir" value="${build.dir}/${dist.file}"/>
<!-- Xalan-J1 compatability stuff. -->
- <!-- DEPRECATED: new 'skipcompat' flag allows you to optionally skip 1.x
compat layer -->
+ <!-- TO BE REMOVED: 'skipcompat' flag allows you to optionally
+ skip 1.x compat layer; default to true, so we can
+ switch to Xerces 2.x which compat won't compile with -->
+ <property name="skipcompat" value="true"/>
<property name="compat.jar" value="xalanj1compat.jar"/>
<property name="compat.src.dir" value="./compat_src"/>
<property name="build.compat.classes" value="${build.dir}/compat_classes"/>
@@ -174,7 +177,7 @@
<!-- Creates output build directories and doc prerequistes
-->
<!-- ===================================================================
-->
<target name="prepare">
- <echo message="Project:${Name-in-docs} version:${version} build.xml
$Revision: 1.152 $"/>
+ <echo message="Project:${Name-in-docs} version:${version} build.xml
$Revision: 1.153 $"/>
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes}"/>
<!-- Note that all testing-related targets *must* depend on
@@ -195,12 +198,6 @@
<untar src="${doc.generator.styletar}" dest="${xdocs.dir}"/>
<delete file="${doc.generator.styletar}"/>
- <!--removing todo.xml, which is completely out of date; placed developer
list in readme.xml -->
- <!--echo message="Transform todo.xml and put the result in
${build.docs}"/>
- <java fork="yes" classname="${xalan.cmdline.class}">
- <classpath refid="docs.class.path" />
- <arg line="-in todo.xml -xsl todo.xsl -out build/docs/todo.html"/>
- </java-->
<!-- We use a Notes agent to periodically extract Xalan-Java 2 commits
from our team database into commits.xml. The following operation
transforms commits.xml (just including source code commits) and puts the
result in xdocs/sources/xalan for inclusion in the
readme.xml -->
@@ -704,7 +701,7 @@
<!-- ===================================================================
-->
<!-- Creates the distribution
-->
<!-- ===================================================================
-->
- <target name="dist"
depends="jar,docs,javadocs,samples,servlet,compat.jar,compat.javadocs,xsltc.jar,xsltc.docs,autodist,todo"
+ <target name="dist"
depends="jar,docs,javadocs,samples,servlet,compat.jar,compat.javadocs,xsltc.jar,xsltc.docs,autodist"
description="Create a .zip/.tar.gz distribution module" >
<echo message="dist is human-useable target for distribution, with all
dependencies"/>
</target>
@@ -761,11 +758,13 @@
<copy file="${build.xsltc.jar}" todir="${dist.dir}/bin"/>
<copy todir="${dist.dir}">
- <fileset dir="."
includes="readme.html,KEYS,License,build.xml,build.sh,build.bat,todo.xml,xsltc_todo.xml,todo.xsl,commits.xml"/>
+ <fileset dir="."
includes="readme.html,KEYS,License,build.xml,build.sh,build.bat,xsltc_todo.xml,todo.xsl,commits.xml"/>
</copy>
<!-- Build separate -src and -bin distros for both .zip and .tar.gz -->
- <!-- Explicitly list xerces.jar in patternsets since we definitely want
Xerces in distros -->
+ <!-- Explicitly list xercesImpl.jar in patternsets since we
+ always want Xerces in distros, immaterial of parser
+ used to compile (at least for official builds) -->
<patternset id="bin-distro" >
<include name="${dist.file}/readme.html"/>
<include name="${dist.file}/License"/>
@@ -773,7 +772,7 @@
<include name="${dist.file}/bin/${name}.jar"/>
<include name="${dist.file}/bin/${xmlapis.jar.name}"/>
<include name="${dist.file}/bin/xsltc.jar"/>
- <include name="${dist.file}/bin/xerces.jar"/>
+ <include name="${dist.file}/bin/xercesImpl.jar"/>
<include name="${dist.file}/bin/${bsf.jar.name}"/>
<include name="${dist.file}/bin/xalansamples.jar"/>
<include name="${dist.file}/bin/xalanservlet.jar"/>
@@ -783,7 +782,7 @@
<patternset id="src-distro" >
<include name="${dist.file}/*"/>
<include name="${dist.file}/bin/ant*"/>
- <include name="${dist.file}/bin/xerces.jar"/>
+ <include name="${dist.file}/bin/xercesImpl.jar"/>
<include name="${dist.file}/bin/${xmlapis.jar.name}"/>
<include name="${dist.file}/bin/${bsf.jar.name}"/>
<include name="${dist.file}/bin/${stylebook.jar.name}"/>
@@ -910,17 +909,6 @@
<echo message=" [tests] it is not included in binary distributions." />
<echo message=" [tests] See http://xml.apache.org/xalan-j/test/ for more
info." />
</target>
-
- <!-- ===================================================================
-->
- <!-- Creates the todo list for the org.apache.xml website
-->
- <!-- ===================================================================
-->
- <target name="todo">
- <java fork="yes"
- classname="${xalan.cmdline.class}"
- classpathref="docs.class.path" >
- <arg line="-in todo.xml -xsl todo.xsl -out todo.html"/>
- </java>
- </target>
<!-- ===================================================================
-->
<!-- Creates the xalan design document
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
