dleslie     00/11/01 08:54:06

  Modified:    .        build.xml
  Log:
  Completed update to work with ant 1.2.
  
  Revision  Changes    Path
  1.36      +19 -18    xml-xalan/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/build.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- build.xml 2000/11/01 15:14:30     1.35
  +++ build.xml 2000/11/01 16:54:03     1.36
  @@ -53,7 +53,7 @@
     
     - Much of this file stolen from Stefano's xml-xerces build.xml  
     
  -   $Id: build.xml,v 1.35 2000/11/01 15:14:30 dleslie Exp $
  +   $Id: build.xml,v 1.36 2000/11/01 16:54:03 dleslie Exp $
      
   ==================================================================== -->
   
  @@ -82,7 +82,7 @@
     <property name="xdocs.book" value="${xdocs.dir}/sources/xalanLocal.xml"/>
     <property name="xdocs.style" value="${xdocs.dir}/style"/>
     <property name="xalanonly-styledocs"
  -            
value="loaderjdoc.xml,dtd/javadocpackages.dtd,dtd/xsl-html40s.dtd, 
stylesheets/designdoc2html.xsl, 
stylesheets/design2project.xsl,stylesheets/notice.xsl,stylesheets/package2html.xsl,stylesheets/packages2project.xsl"/>
  +            
value="loaderjdoc.xml,dtd/javadocpackages.dtd,dtd/xsl-html40s.dtd,stylesheets/designdoc2html.xsl,
 
stylesheets/design2project.xsl,stylesheets/notice.xsl,stylesheets/package2html.xsl,stylesheets/packages2project.xsl"/>
     <property name="xdocs.javadocbook" 
value="${xdocs.dir}/sources/javadocPackages.xml"/>
     <property name="xdocs.javadocloader" value="sbk:/style/loaderjdoc.xml"/>
     <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
  @@ -96,7 +96,7 @@
     <property name="build.apidocs" value="${build.docs}/apidocs"/>
     
     <property name="dist.file" value="${name}-j_${version}"/>
  -  <property name="build.dist" value="${build.dir}/${dist.file}"/>
  +  <property name="dist.dir" value="${build.dir}/${dist.file}"/>
     
     <property name="site.root" value="./xml-site"/>
     <property name="site.dir" value="./xml-site/target/xalan"/>
  @@ -112,6 +112,7 @@
     <target name="prepare.docs" depends="prepare">
       <gunzip src="${doc.generator.styletargz}"/>
       <untar src="${doc.generator.styletar}" dest="${xdocs.dir}"/>
  +     <delete file="${doc.generator.styletar}"/>
       <mkdir dir="${build.docs}"/>
       <mkdir dir="${build.apidocs}"/>
     </target>
  @@ -258,47 +259,47 @@
     </target>
     <target name="autodist">
       <echo message="autodist is for automated build processes, without 
dependencies"/>
  -    <mkdir dir="${build.dist}"/>
  -    <mkdir dir="${build.dist}/src"/>
  -    <mkdir dir="${build.dist}/xdocs"/>
  -    <mkdir dir="${build.dist}/docs"/>
  -    <mkdir dir="${build.dist}/docs/javadocs"/>
  -    <mkdir dir="${build.dist}/samples"/>
  +    <mkdir dir="${dist.dir}"/>
  +    <mkdir dir="${dist.dir}/src"/>
  +    <mkdir dir="${dist.dir}/xdocs"/>
  +    <mkdir dir="${dist.dir}/docs"/>
  +    <mkdir dir="${dist.dir}/docs/javadocs"/>
  +    <mkdir dir="${dist.dir}/samples"/>
   
       <!-- Copy over sources and source documentation -->
  -    <copy todir="${build.dist}/src">
  +    <copy todir="${dist.dir}/src">
         <fileset dir="${src.dir}"/>
       </copy>
  -    <copy todir="${build.dist}/xdocs">
  +    <copy todir="${dist.dir}/xdocs">
         <fileset dir="${xdocs.dir}"/>
       </copy>
       
       <!-- Copy over pre-built documentation and javadoc, and samples src and 
jar -->
  -    <copy todir="${build.dist}/docs">
  +    <copy todir="${dist.dir}/docs">
         <fileset dir="${build.docs}"/>
       </copy>  
  -    <copy todir="${build.dist}/samples">
  +    <copy todir="${dist.dir}/samples">
         <fileset dir="${samples.dir}"/>
       </copy>   
  -    <copy file="${build.samples}/xalansamples.jar" 
todir="${build.dist}/samples"/>
  +    <copy file="${build.samples}/xalansamples.jar" 
todir="${dist.dir}/samples"/>
   
       <!-- Copy runtime jars into old-style locations in the root -->
  -    <copy todir="${build.dist}">
  +    <copy todir="${dist.dir}">
         <fileset dir="${build.dir}" includes="xalan.jar,xerces.jar,bsf.jar"/>
       </copy>
       
  -    <copy todir="${build.dist}">
  +    <copy todir="${dist.dir}">
         <fileset dir="." 
includes="README,README.html,CREDITS,KEYS,License,build.xml,build.sh,build.bat"/>
       </copy>
   
       <!-- Copy Ant-related build.xml and other READMEs, etc. -->
  -    <mkdir dir="${build.dist}/bin"/>
  -    <copy todir="${build.dist}/bin">
  +    <mkdir dir="${dist.dir}/bin"/>
  +    <copy todir="${dist.dir}/bin">
         <fileset dir="${bin.dir}" includes="ant.jar,antRun,antRun.bat"/>
       </copy>
       
       <!-- Old Makefile etc. - deprecated. -->
  -    <copy todir="${build.dist}">
  +    <copy todir="${dist.dir}">
         <fileset dir="." includes="Makefile,make.include,make.include2"/>
       </copy>
       
  
  
  

Reply via email to