cziegeler    01/06/01 04:44:21

  Modified:    .        build.xml
  Log:
  Applied patch for build dist-tgz submitted by Bart Guijt and fixed error when 
building twice
  
  Revision  Changes    Path
  1.5       +15 -12    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml 2001/05/22 14:30:20     1.4
  +++ build.xml 2001/06/01 11:44:20     1.5
  @@ -25,7 +25,7 @@
   version of Ant and the build scripts take care of running it.
   
   The only thing that you have to make sure, is the "JAVA_HOME" environment
  -property should be set to match the JVM you want to use. 
  +property should be set to match the JVM you want to use.
   
   That's all you have to do to be ready to go.
   
  @@ -52,7 +52,7 @@
   Building on another directory
   =============================
   
  -Sometimes you might want to build on an external directory to keep the 
  +Sometimes you might want to build on an external directory to keep the
   distribution clean: no worries, this is just an environment property away.
   Suppose you want to use the "../build" directory instead, you simply tipe
   
  @@ -301,7 +301,7 @@
         <fileset dir="${build.src}">
           <include name="**/Manifest.mf"/>
           <include name="**/*.xsl"/>
  -     <include name="**/*.roles"/>
  +    <include name="**/*.roles"/>
         </fileset>
       </copy>
   
  @@ -372,7 +372,7 @@
           <pathelement location="${build.dir}/${name}.jar"/>
           <pathelement location="${java.home}/../lib/tools.jar"/>
         </classpath>
  -    </java>  
  +    </java>
     </target>
   
     <!-- =================================================================== -->
  @@ -417,7 +417,7 @@
     <target name="remove-webapp" if="remove.webapp" description="Removes existing 
uncompressed webapp" depends="init">
       <delete dir="${install.war}/${name}"/>
     </target>
  -  
  +
     <!-- =================================================================== -->
     <!-- Installs Cocoon file                                                -->
     <!-- =================================================================== -->
  @@ -473,7 +473,7 @@
         <srcfiles dir="${docs.dir}" includes="*.xml" excludes="${site.projfile}"/>
       </uptodate>
     </target>
  - 
  +
     <!-- =================================================================== -->
     <!-- If generated  docs is already up-to-date, print a message saying so. -->
     <!-- =================================================================== -->
  @@ -508,7 +508,7 @@
         <srcfiles dir="${docs.dir}" includes="*.xml" excludes="${site.projfile}"/>
       </uptodate>
     </target>
  - 
  +
     <!-- =================================================================== -->
     <!-- If generated printer docs is already up-to-date, print a message saying so. 
-->
     <!-- =================================================================== -->
  @@ -577,7 +577,7 @@
         <srcfiles dir= "${build.src}" includes="**/*.java"/>
       </uptodate>
     </target>
  -  
  +
     <!-- =================================================================== -->
     <!-- If javadoc is already up-to-date, print a message saying so.        -->
     <!-- =================================================================== -->
  @@ -682,16 +682,19 @@
     <!-- Packages the distribution as .zip                                   -->
     <!-- =================================================================== -->
     <target name="dist-zip" depends="dist" description="* Generates the distribution 
as a .zip file">
  -    <zip zipfile="${dist.target}/${Name}-${version}.zip" basedir="${dist.dir}"
  -        includes="**" excludes="**/${Name}-${version}.tar*"/>
  +    <zip zipfile="${dist.target}/${Name}-${version}.zip"
  +         basedir="${dist.dir}"/>
     </target>
   
     <!-- =================================================================== -->
     <!-- Packages the distribution with .tar.gzip                            -->
     <!-- =================================================================== -->
     <target name="dist-tgz" depends="dist" description="* Generates the distribution 
as a .tar.gz file">
  -    <tar tarfile="${dist.target}/${Name}-${version}.tar" basedir="${dist.root}" 
excludes="**/${Name}-${version}.zip"/>
  -    <gzip zipfile="${dist.target}/${Name}-${version}.tar.gz" 
src="${dist.target}/${Name}-${version}.tar"/>
  +    <tar tarfile="${dist.target}/${Name}-${version}.tar"
  +         basedir="${dist.dir}"
  +         longfile="gnu"/>
  +    <gzip zipfile="${dist.target}/${Name}-${version}.tar.gz"
  +          src="${dist.target}/${Name}-${version}.tar"/>
     </target>
   
     <!-- =================================================================== -->
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to