You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2002/10/09 17:35:27 UTC

cvs commit: xml-xalan/java build.xml

mkwan       2002/10/09 08:35:27

  Added:       java     Tag: XSLTC_DTM build.xml
  Log:
  Update build scripts for XSLTC_DTM branch
  
  The default target is to create one big jar which contains Xalan and XSLTC.
  Here is the list of changes:
  
  Target             Changes
  jar:               Create one big xalan.jar containing Xalan, XSLTC and XSLTC support jars
  (New)unbundledjar: Create xalan-unbundled.jar which contains Xalan and XSLTC, w/o the XSLTC support jars
  (New)xalan-interpreter.jar:  Create xalan-interpreter.jar, only containing Xalan
  (New)xalan-interpreter.compile: Only compile classes for Xalan interpreter
  xsltc.jar:         Now includes the xml utils and DTM classes under org/apache/xml
  compile:           Compile everything (Xalan and XSLTC)
  
  Other changes:
  Implement correct dependency on XPath parser and lexer for xsltc.compile.
  The parser and lexer steps are only run as needed.
  
  Get rid of the xsltctmp directory when making the xsltc.jar. The support
  jars are copied and expanded under the build/classes directory.
  
  These two changes make "build jar" a no-op if there is no other change.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.176.2.1 +174 -123  xml-xalan/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/build.xml,v
  retrieving revision 1.176
  retrieving revision 1.176.2.1
  diff -u -r1.176 -r1.176.2.1
  --- build.xml	11 Sep 2002 18:41:54 -0000	1.176
  +++ build.xml	9 Oct 2002 15:35:27 -0000	1.176.2.1
  @@ -80,7 +80,8 @@
     <property name="runtime.jar" value="${bin.dir}/${runtime.jar.name}"/>
     <property name="regexp.jar.name" value="regexp.jar"/>
     <property name="regexp.jar" value="${bin.dir}/${regexp.jar.name}"/>
  -
  +  <property name="xsltc.deps.license" value="BCEL.LICENSE.txt,BCEL.README.txt,JLex.LICENSE.txt,JLex.README.txt,java_cup.LICENSE.txt,java_cup.README.txt,runtime.LICENSE.txt,runtime.README.txt,regexp.LICENSE.txt,regexp.README.txt"/>
  +  
     <!-- Defines general variables used by the other targets; name controls output xalan.jar  -->
     <property name="version.VERSION" value="2"/>
     <property name="version.RELEASE" value="4"/>
  @@ -107,6 +108,8 @@
     <!-- Build and distribution output areas -->
     <property name="build.dir" value="./build"/><!-- GUMP: root of all normal builds output -->
     <property name="build.xalan.jar" value="${build.dir}/${name}.jar"/><!-- GUMP: actual path/name of jar target output -->
  +  <property name="build.xalan-unbundled.jar" value="${build.dir}/${name}-unbundled.jar"/>
  +  <property name="build.xalan-interpreter.jar" value="${build.dir}/${name}-interpreter.jar"/>
     <property name="build.xsltc.jar" value="${build.dir}/xsltc.jar"/>
     <property name="build.classes" value="${build.dir}/classes"/>
     <property name="build.docs" value="${build.dir}/docs"/>
  @@ -180,7 +183,7 @@
       <pathelement location="${build.classes}" />
       <pathelement path="${sun.boot.class.path}" />
     </path>
  -
  +  
     <!-- =================================================================== -->
     <!-- Creates output build directories and doc prerequistes               -->
     <!-- =================================================================== -->
  @@ -223,11 +226,29 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Compile entire source tree                                          -->
  +  <!-- Compile the DTM implementation and xml utilities                    -->
  +  <!-- =================================================================== -->
  +  <target name="xml.compile" depends="prepare">
  +    <echo message="Compiling DTM implementation and utilities" />
  +    <javac srcdir="${src.dir}"
  +           destdir="${build.classes}"
  +           debug="${build.debug}" >
  +      <include name="${apachexml.reldir}/**/*.java" />
  +      <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
  +      <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />      
  +      <exclude name="**/IncrementalSAXSource_Xerces.java" 
  +        unless="xerces.present"	 />
  +      <classpath refid="compile.class.path" />
  +      <bootclasspath refid="xslt.boot.class.path" />
  +    </javac>
  +  </target>
  +  
  +  <!-- =================================================================== -->
  +  <!-- Compile the Xalan interpreter source tree                           -->
     <!-- =================================================================== -->
  -  <target name="compile" depends="prepare"
  -    description="Compile Xalan-J 2.x (skips 1.x compat and XSLTC)" >
  -    <echo message="compile entire source tree and copy .properties and .res files to build tree."/>
  +  <target name="xalan-interpreter.compile" depends="xml.compile"
  +    description="Compile the Xalan interpreter classes (skips 1.x compat and XSLTC)" >
  +    <echo message="Compiling Xalan interpreter classes" />
       <!-- Note: split compile into separate javac steps to avoid JDK 1.1.8 bug reported at:
            http://developer.java.sun.com/developer/bugParade/bugs/4043508.html
            which causes an error like:
  @@ -240,20 +261,11 @@
         <!-- Also compile version info classes here -->
         <include name="${xalan.reldir}/Version.java" />
         <include name="${xalan.reldir}/processor/XSLProcessorVersion.java" />
  -      <include name="${apachexml.reldir}/**/*.java" />
  -      <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
  -      <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />
         <include name="${xpath.reldir}/**/*.java" />
  -      <exclude name="**/CoroutineSAXFilterTest.java" 
  -        unless="xerces.present"	 />
  -      <exclude name="**/CoroutineSAXParser_Xerces.java" 
  -        unless="xerces.present"	 />
  -      <exclude name="**/IncrementalSAXSource_Xerces.java" 
  -        unless="xerces.present"	 />
         <classpath refid="compile.class.path" />
         <bootclasspath refid="xslt.boot.class.path" />
       </javac>
  -    <!-- Compile Xalan main engine (but not xsltc package yet) -->
  +    <!-- Compile Xalan interpreter main engine (but not xsltc package yet) -->
       <javac srcdir="${src.dir}" 
              destdir="${build.classes}"
              includes="${xalan.reldir}/**/*.java"
  @@ -275,9 +287,14 @@
         <fileset dir="${src.dir}" includes="**/*.properties,**/*.res,META-INF/services/*"/>
       </copy>  
     </target>
  +  
  +  <!-- Compile all java sources (Xalan interpreter and XSLTC) -->
  +  <target name="compile" depends="xalan-interpreter.compile,xsltc.compile"
  +    description="Compile all java source files (Xalan interpreter + XSLTC)" >
  +  </target>
   
     <!-- =================================================================== -->
  -  <!-- Compile just the XSLTC compiler portion (to be integrated soon!) -->
  +  <!-- Compile just the XSLTC compiler portion                             -->
     <!-- =================================================================== -->
     <path id="xsltc.class.path">
       <pathelement location="${xmlapis.jar}" />
  @@ -308,19 +325,24 @@
            actually need to generate the java_cup and jlex files 
            in the two sub-targets below
       -->
  -    <!-- NOTE: The two uptodate tasks below do not yet work! 28-Nov-01 -sc -->
  -    <uptodate property="xsltc.java_cup.needed"  >
  -      <srcfiles dir= "${src.dir}/${xsltc.reldir}/compiler" includes="xpath.cup"/>
  -      <mapper type="merge" to="${generated.xpathparser}"/>
  -    </uptodate>
  -    <uptodate property="xsltc.jlex.needed"  >
  -      <srcfiles dir= "${src.dir}/${xsltc.reldir}/compiler" includes="xpath.lex"/>
  -      <mapper type="merge" to="${generated.xpathlexer}"/>
  +    <uptodate property="xsltc.java_cup.not_needed" targetfile="${generated.xpathparser}" >
  +      <srcfiles dir="${src.dir}/${xsltc.reldir}/compiler" includes="xpath.cup" />
       </uptodate>
  +
  +    <uptodate property="xsltc.jlex.not_needed" targetfile="${generated.xpathlexer}" >
  +      <srcfiles dir="${src.dir}/${xsltc.reldir}/compiler" includes="xpath.lex" />
  +    </uptodate> 
  +    
  +    <!-- Determine whether the support jars are already expanded -->
  +    <available file="${build.classes}/org/apache/bcel" type="dir" property="xsltc.bcel_jar.not_needed" />
  +    <available file="${build.classes}/JLex" type="dir" property="xsltc.jlex_jar.not_needed" />
  +    <available file="${build.classes}/java_cup/Main.class" type="file" property="xsltc.java_cup_jar.not_needed" />
  +    <available file="${build.classes}/java_cup/runtime" type="dir" property="xsltc.runtime_jar.not_needed" />
  +    <available file="${build.classes}/org/apache/regexp" type="dir" property="xsltc.regexp_jar.not_needed" />
     </target>
   
  -  <!-- Generate code sources for xsltc if needed -->
  -  <target name="xsltc.java_cup" depends="xsltc.prepare" > <!-- if="xsltc.java_cup.needed" -->
  +  <!-- Generate the XPath parser sources for xsltc if needed -->
  +  <target name="xsltc.java_cup" depends="xsltc.prepare" unless="xsltc.java_cup.not_needed">
       <!-- The second step generates sym.java and XPathParser.java. -->
       <echo message="java_cup preparsing"/>
       <java fork="yes" failonerror="true" 
  @@ -333,9 +355,10 @@
       <echo message="java_cup move output files"/>
       <move file="XPathParser.java" tofile="${generated.xpathparser}"/>
       <move file="sym.java" tofile="${generated.xpathsym}"/>
  -
     </target>
  -  <target name="xsltc.jlex" depends="xsltc.java_cup" ><!--if="xsltc.jlex.needed" -->
  +  
  +  <!-- Generate the XPath lexer sources for xsltc if needed -->
  +  <target name="xsltc.jlex" depends="xsltc.java_cup" unless="xsltc.jlex.not_needed">
       <!-- The third step generates XPathLexer.java. The lexiographical analyser
       has to be generated after sym.java, so order is important. -->
       <echo message="JLex preparsing"/>
  @@ -347,11 +370,8 @@
       <move file="${src.dir}/${xsltc.reldir}/compiler/xpath.lex.java" tofile="${generated.xpathlexer}"/>
     </target>
   
  -  <!-- The xsltc.compile target should be rewritten to properly 
  -       do dependencies on the generated sources: right now, it 
  -       will always regenerate the sources, even if it's not needed
  -       (which forces all later steps to re-run as well) -->
  -  <target name="xsltc.compile" depends="xsltc.java_cup,xsltc.jlex"
  +  <!-- Compile the main XSLTC classes -->
  +  <target name="xsltc.compile" depends="xsltc.java_cup,xsltc.jlex,xml.compile"
       description="Compile just the XSLTC classes" >
       <echo message="Compiling remaining XSLTC classes"/>
       <javac srcdir="${src.dir}" 
  @@ -363,7 +383,8 @@
       </javac>
     </target>
   
  -  <target name="xsltc.fcompile" 
  +  <!-- Compile just the XSLTC classes w/o JLex, JCup recompilation -->
  +  <target name="xsltc.fcompile" depends="xml.compile"
       description="Compile just the XSLTC classes w/o JLex, JCup recompilation" >
       <echo message="Compiling remaining XSLTC classes"/>
       <javac srcdir="${src.dir}" 
  @@ -375,6 +396,7 @@
       </javac>
     </target>
   
  +  <!-- Jar up the XSLTC classes w/o the support jars -->
     <target name="xsltc.unbundledjar" depends="xsltc.compile"
       description="Jar just the xsltc.jar file" >
       <!-- Copy over the manifest, with filtering (for version number) -->
  @@ -382,85 +404,68 @@
       <copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/>
       <jar jarfile="${build.xsltc.jar}" manifest="${build.dir}/manifest.xsltc" basedir="${build.classes}" >
         <patternset><!-- relative to jar/@basedir -->
  +        <include name="org/apache/xml/**" />
           <include name="${xsltc.reldir}/**/*" />
         </patternset>
       </jar>
     </target>
   
  +  <!-- Copy license and readme files for XSLTC support jars -->
  +  <target name="xsltc.copy-licenses" depends="xsltc.prepare">
  +    <echo message="Copying license files for XSLTC support jars"/>
  +    <copy todir="${build.classes}">
  +      <fileset dir="${bin.dir}" casesensitive="no" includes="${xsltc.deps.license}"/>
  +    </copy>
  +  </target>
   
  -  <target name="xsltc.jar" depends="xsltc.compile"
  -     description="Jar xsltc, BCEL,JLex,java_cup,runtime and jakarta regexp">
  -    <!-- make a tmp directory to work in -->
  -    <delete dir="${build.dir}/xsltctmp" includeEmptyDirs="true" quiet="true"/>
  -    <mkdir  dir="${build.dir}/xsltctmp" />
  -
  -    <!-- create jar of xsltc classes in the tmp directory -->
  -    <jar jarfile="${build.dir}/xsltctmp/xsltc.jar"
  -        basedir="${build.dir}/classes"
  -        includes="org/apache/xalan/xsltc/**" />
  +  <!-- A parametrized target which is used to copy and expand a XSLTC support jar -->
  +  <target name="xsltc.copy-deps-jar" unless="${param_unless}">
  +    <!-- copy the jar file to the build/classes directory -->
  +    <copy todir="${build.classes}" file="${bin.dir}/${param_jar_name}"/>
  +    
  +    <!-- unjar the jar file -->
  +    <unjar src="${build.classes}/${param_jar_name}" dest="${build.classes}" />
  +    
  +    <!-- remove the jar file -->
  +    <delete file="${build.classes}/${param_jar_name}" />
  +  </target>
  +  
  +  <!-- Copy and expand the XSLTC support jars if needed -->
  +  <target name="xsltc.copy-deps-jars" depends="xsltc.copy-licenses">
  +    <echo message="Copying XSLTC support jars" />
  +    <!-- copy the 3rd party support jar files -->
  +    <antcall target="xsltc.copy-deps-jar">
  +      <param name="param_unless" value="xsltc.bcel_jar.not_needed" />
  +      <param name="param_jar_name" value="${bcel.jar.name}" />
  +    </antcall>
  +
  +    <antcall target="xsltc.copy-deps-jar">
  +      <param name="param_unless" value="xsltc.jlex_jar.not_needed" />
  +      <param name="param_jar_name" value="${jlex.jar.name}" />
  +    </antcall>
  +
  +    <antcall target="xsltc.copy-deps-jar">
  +      <param name="param_unless" value="xsltc.java_cup_jar.not_needed" />
  +      <param name="param_jar_name" value="${java_cup.jar.name}" />
  +    </antcall>
  +
  +    <antcall target="xsltc.copy-deps-jar">
  +      <param name="param_unless" value="xsltc.runtime_jar.not_needed" />
  +      <param name="param_jar_name" value="${runtime.jar.name}" />
  +    </antcall>
  +
  +    <antcall target="xsltc.copy-deps-jar">
  +      <param name="param_unless" value="xsltc.regexp_jar.not_needed" />
  +      <param name="param_jar_name" value="${regexp.jar.name}" />
  +    </antcall>
  +    
  +    <!-- remove the old META-INF/MANIFEST.MF file -->
  +    <delete file="${build.classes}/META-INF/MANIFEST.MF" quiet="true"/>  
  +  </target>
   
  -    <!-- copy the xsltc 3rd party support jar files and licenses 
  -         to tmp dist dir 
  -    -->
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/BCEL.jar"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/BCEL.LICENSE.txt"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/BCEL.README.txt"/>
  -
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/JLex.jar"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/JLex.LICENSE.txt"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/JLex.README.txt"/>
  -
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/java_cup.jar"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/java_cup.LICENSE.txt"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/java_cup.README.txt"/>
  -
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/runtime.jar"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/runtime.LICENSE.txt"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/runtime.README.txt"/>
  -
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/regexp.jar"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/regexp.LICENSE.txt"/>
  -    <copy todir="${build.dir}/xsltctmp"
  -      file="${bin.dir}/regexp.README.txt"/>
  -
  -    <!-- unjar all jars -->
  -    <unjar src="${build.dir}/xsltctmp/xsltc.jar"
  -           dest="${build.dir}/xsltctmp" />
  -    <unjar src="${build.dir}/xsltctmp/BCEL.jar"
  -           dest="${build.dir}/xsltctmp" />
  -    <unjar src="${build.dir}/xsltctmp/JLex.jar"
  -           dest="${build.dir}/xsltctmp" />
  -    <unjar src="${build.dir}/xsltctmp/java_cup.jar"
  -           dest="${build.dir}/xsltctmp" />
  -    <unjar src="${build.dir}/xsltctmp/runtime.jar"
  -           dest="${build.dir}/xsltctmp" />
  -    <unjar src="${build.dir}/xsltctmp/regexp.jar"
  -           dest="${build.dir}/xsltctmp" />
  -
  -    <!-- remove jar files -->
  -    <delete file="${build.dir}/xsltctmp/xsltc.jar" />
  -    <delete file="${build.dir}/xsltctmp/BCEL.jar" />
  -    <delete file="${build.dir}/xsltctmp/JLex.jar" />
  -    <delete file="${build.dir}/xsltctmp/java_cup.jar" />
  -    <delete file="${build.dir}/xsltctmp/runtime.jar" />
  -
  -    <!-- remove old META-INF dir -->
  -    <delete dir="${build.dir}/xsltctmp/META-INF"
  -        includeEmptyDirs="true" quiet="true"/>
  +  <!-- Jar up all XSLTC classes including the support jars -->
  +  <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars"
  +     description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp">
   
       <!-- create new META-INF dir w/ transformer factory default -->
       <!-- GTM: comment this out so that bundled xsltc.jar does not have
  @@ -477,29 +482,71 @@
       <copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/>
       
       <!-- make bundled jar named xsltc.jar -->
  -    <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc"
  -         basedir="${build.dir}/xsltctmp" />
  +    <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc" >
  +      <fileset dir="${build.classes}" includes="org/apache/xalan/xsltc/**" />
  +      <fileset dir="${build.classes}" includes="org/apache/xml/**" />
  +      <fileset dir="${build.classes}" includes="org/apache/bcel/**" />
  +      <fileset dir="${build.classes}" includes="JLex/**" />
  +      <fileset dir="${build.classes}" includes="java_cup/**" />
  +      <fileset dir="${build.classes}" includes="org/apache/regexp/**" />
  +      <fileset dir="${build.classes}" includes="${xsltc.deps.license}" />
  +    </jar>
   
  -    <!-- clean up tmp directory -->
  -    <delete dir="${build.dir}/xsltctmp" includeEmptyDirs="true" quiet="true"/>
     </target>
     
     <!-- =================================================================== -->
  -  <!-- Creates the xalan JAR                                               -->
  +  <!-- Creates the xalan interpreter jar                                   -->
     <!-- =================================================================== -->
  -  <target name="jar" depends="compile"
  -    description="Jar up xalan.jar, plus the ${xmlapis.jar.name}" >
  +  <target name="xalan-interpreter.jar" depends="xalan-interpreter.compile"
  +    description="Jar up everything in Xalan interpreter (without XSLTC)" >
       <!-- Copy over the manifest, with filtering (for version number) -->
       <filter token="impl.version" value="${impl.version}"/>
       <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
  -    <jar jarfile="${build.xalan.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" >
  +    <jar jarfile="${build.xalan-interpreter.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" >
         <patternset><!-- relative to jar/@basedir -->
  +        <include name="${apachexml.reldir}/**/*" />
  +        <include name="${xpath.reldir}/**/*" />
  +        <include name="${xalan.reldir}/**/*" />
  +        <include name="META-INF/services/*" />
           <exclude name="${xsltc.reldir}/**/*" />
         </patternset>
       </jar>
     </target>
     
     <!-- =================================================================== -->
  +  <!-- Creates the xalan unbundled jar (Xalan interpreter + XSLTC)         -->
  +  <!-- =================================================================== -->
  +  <target name="unbundledjar" depends="xalan-interpreter.compile,xsltc.compile"
  +    description="Jar up Xalan and XSLTC, without the XSLTC dependencies" >
  +    <filter token="impl.version" value="${impl.version}"/>
  +    <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
  +    <jar jarfile="${build.xalan-unbundled.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" >
  +      <patternset>
  +        <include name="${apachexml.reldir}/**/*" />
  +        <include name="${xpath.reldir}/**/*" />
  +        <include name="${xalan.reldir}/**/*" />
  +        <include name="META-INF/services/*" />
  +      </patternset>    
  +    </jar>
  +  </target>
  +  
  +  <!-- =================================================================== -->
  +  <!-- Creates one big xalan jar (Xalan interpreter + XSLTC + support jars) -->
  +  <!-- =================================================================== -->
  +  <target name="jar" depends="xalan-interpreter.compile,xsltc.compile,xsltc.copy-deps-jars"
  +    description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" >
  +    
  +    <!-- Copy over the manifest, with filtering (for version number) -->
  +    <filter token="impl.version" value="${impl.version}"/>
  +    <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/>
  +    
  +    <!-- make bundled jar named xalan.jar -->
  +    <jar jarfile="${build.xalan.jar}" manifest="${build.dir}/MANIFEST.MF"
  +         basedir="${build.classes}" />
  +  
  +  </target>
  +  
  +  <!-- =================================================================== -->
     <!-- Default all target simply Creates the xalan JAR                     -->
     <!-- =================================================================== -->
     <target name="all" depends="jar"><!-- 'Standardizing build.xml files' <bl...@apache.org> -->
  @@ -656,8 +703,8 @@
     <!-- When we have straightened out classpath issues,                     -->
     <!-- add samples in CompiledApplet, CompiledBrazil, and CompiledServlet  -->
     <!-- =================================================================== -->
  -  <target name="xsltc.samples" depends="jar,xsltc.jar">
  -    <javac srcdir="${samples.dir}/translets" classpath="${java.class.path}:${build.xsltc.jar}" 
  +  <target name="xsltc.samples" depends="jar">
  +    <javac srcdir="${samples.dir}/translets" classpath="${java.class.path}:${build.xalan.jar}" 
              destdir="${samples.dir}/translets" excludes="${exclude}" 
              debug="${build.debug}"
              bootclasspathref="xslt.boot.class.path" />
  @@ -730,6 +777,12 @@
                    packages="org.apache.xalan.xsltc*"/>
       </javadoc>
       
  +    <!-- remove the xml-commons sources -->
  +    <delete dir="${src.dir}/javax/xml" />
  +    <delete dir="${src.dir}/org/w3c/dom" />
  +    <delete dir="${src.dir}/org/xml/sax" />
  +    <delete dir="${src.dir}/org/apache/xmlcommons" />
  +    <delete file="${src.dir}/manifest.commons" />
     </target>
   
     <!-- =================================================================== -->
  @@ -775,7 +828,7 @@
     <!-- =================================================================== -->
     <!-- Creates the distribution                                            -->
     <!-- =================================================================== -->
  -  <target name="dist" depends="jar,docs,javadocs,samples,servlet,xsltc.jar,xsltc.docs,autodist"
  +  <target name="dist" depends="jar,docs,javadocs,samples,servlet,xsltc.docs,autodist"
       description="Create a .zip/.tar.gz distribution module" >
       <echo message="dist is human-useable target for distribution, with all dependencies"/>
     </target>
  @@ -820,7 +873,6 @@
            *-bin.zip/tar.gz and *-src.zip/tar.gz files.
       -->
       <copy file="${build.xalan.jar}" todir="${dist.dir}/bin" />
  -    <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,xsltc_todo.xml,todo.xsl,commits.xml"/>
  @@ -836,9 +888,8 @@
         <include name="${dist.file}/KEYS"/>
         <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/xercesImpl.jar"/>
         <include name="${dist.file}/bin/${bsf.jar.name}"/>
  +      <include name="${dist.file}/bin/xercesImpl.jar"/>
         <include name="${dist.file}/bin/xalansamples.jar"/>
         <include name="${dist.file}/bin/xalanservlet.jar"/>
         <include name="${dist.file}/samples/"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org