You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2004/05/14 17:12:04 UTC

cvs commit: cocoon-lenya/src/targets init-build.xml dist-build.xml

michi       2004/05/14 08:12:04

  Modified:    src/targets init-build.xml dist-build.xml
  Log:
  building snapshots cleaned
  
  Revision  Changes    Path
  1.31      +6 -3      cocoon-lenya/src/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/targets/init-build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- init-build.xml	12 May 2004 21:51:29 -0000	1.30
  +++ init-build.xml	14 May 2004 15:12:04 -0000	1.31
  @@ -49,8 +49,11 @@
       <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
   
       <property name="today"         value="${TODAY}"/>
  -    <property name="snapshot.bin.dir" value="${dist.root}/incubating-${fullname}-bin-${SNAPSHOT_STAMP}"/>
  -    <property name="snapshot.src.dir" value="${dist.root}/incubating-${fullname}-src-${SNAPSHOT_STAMP}"/>
  +
  +    <property name="snapshot.bin.name" value="incubating-${fullname}-${SNAPSHOT_STAMP}-bin"/>
  +    <property name="snapshot.src.name" value="incubating-${fullname}-${SNAPSHOT_STAMP}-src"/>
  +    <property name="snapshot.bin.dir" value="${dist.root}/${snapshot.bin.name}"/>
  +    <property name="snapshot.src.dir" value="${dist.root}/${snapshot.src.name}"/>
   
       
     </target>
  
  
  
  1.9       +10 -8     cocoon-lenya/src/targets/dist-build.xml
  
  Index: dist-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/targets/dist-build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- dist-build.xml	4 May 2004 13:50:30 -0000	1.8
  +++ dist-build.xml	14 May 2004 15:12:04 -0000	1.9
  @@ -35,6 +35,8 @@
         <fileset dir="${basedir}">
           <include name="INSTALL-BIN.txt"/>
           <include name="README.txt"/>
  +        <include name="lenya.sh"/>
  +        <include name="lenya.bat"/>
         </fileset>
       </copy>
   
  @@ -72,12 +74,12 @@
         <fileset dir="${dist.root}/${distname}-bin"/>
       </copy>
   
  -    <tar tarfile="${snapshot.bin.dir}.tar" basedir="${dist.root}" includes="${distname}-bin-${SNAPSHOT_STAMP}/**"/>
  +    <tar tarfile="${snapshot.bin.dir}.tar" basedir="${dist.root}" includes="${snapshot.bin.name}/**"/>
   
       <gzip zipfile="${snapshot.bin.dir}.tar.gz" src="${snapshot.bin.dir}.tar"/>
       <delete file="${snapshot.bin.dir}.tar"/>
   
  -    <zip zipfile="${snapshot.bin.dir}.zip" basedir="${dist.root}/${distname}-bin-${SNAPSHOT_STAMP}"/>
  +    <zip zipfile="${snapshot.bin.dir}.zip" basedir="${dist.root}/${snapshot.bin.name}"/>
   
     </target>
   
  @@ -124,7 +126,7 @@
         <fileset dir="${dist.src.dir}"/>
       </copy>
   
  -    <tar tarfile="${snapshot.src.dir}.tar" basedir="${dist.root}" includes="${distname}-src-${SNAPSHOT_STAMP}/**"/>
  +    <tar tarfile="${snapshot.src.dir}.tar" basedir="${dist.root}" includes="${snapshot.src.name}/**"/>
   
       <gzip zipfile="${snapshot.src.dir}.tar.gz" src="${snapshot.src.dir}.tar"/>
       <delete file="${snapshot.src.dir}.tar"/>
  @@ -133,10 +135,10 @@
   
   
     <target name="zip-webapp" depends="init" description="Zips the webapp in order to deploy within another servlet container">
  -    <echo>Create ./${build.dir}/${fullname}-bin-${SNAPSHOT_STAMP}.tar.gz</echo>
  +    <echo>Create ./${build.dir}/${snapshot.bin.name}.tar.gz</echo>
   
  -    <tar tarfile="./${build.dir}/${fullname}-bin-${SNAPSHOT_STAMP}.tar" basedir="${build.webapp}"/>
  -    <gzip zipfile="./${build.dir}/${fullname}-bin-${SNAPSHOT_STAMP}.tar.gz" src="./${build.dir}/${fullname}-bin-${SNAPSHOT_STAMP}.tar"/>
  -    <delete file="./${build.dir}/${fullname}-bin-${SNAPSHOT_STAMP}.tar"/>
  +    <tar tarfile="./${build.dir}/${snapshot.bin.name}.tar" basedir="${build.webapp}"/>
  +    <gzip zipfile="./${build.dir}/${snapshot.bin.name}.tar.gz" src="./${build.dir}/${snapshot.bin.name}.tar"/>
  +    <delete file="./${build.dir}/${snapshot.bin.name}.tar"/>
     </target>
   </project>
  
  
  

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