Return-Path: 
 <myfaces-cvs-return-766-apmail-incubator-myfaces-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-myfaces-cvs-archive@www.apache.org
Received: (qmail 60666 invoked from network); 14 Apr 2005 23:03:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Apr 2005 23:03:13 -0000
Received: (qmail 26537 invoked by uid 500); 14 Apr 2005 23:03:13 -0000
Delivered-To: apmail-incubator-myfaces-cvs-archive@incubator.apache.org
Received: (qmail 26505 invoked by uid 500); 14 Apr 2005 23:03:13 -0000
Mailing-List: contact myfaces-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:myfaces-cvs-help@incubator.apache.org>
List-Unsubscribe: <mailto:myfaces-cvs-unsubscribe@incubator.apache.org>
List-Post: <mailto:myfaces-cvs@incubator.apache.org>
List-Id: <myfaces-cvs.incubator.apache.org>
Reply-To: "MyFaces Development" <myfaces-dev@<#h>>
Delivered-To: mailing list myfaces-cvs@incubator.apache.org
Received: (qmail 26492 invoked by uid 99); 14 Apr 2005 23:03:13 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 16:03:12 -0700
Received: (qmail 60641 invoked by uid 2030); 14 Apr 2005 23:03:11 -0000
Date: 14 Apr 2005 23:03:11 -0000
Message-ID: <20050414230311.60638.qmail@minotaur.apache.org>
From: schof@apache.org
To: incubator-myfaces-cvs@apache.org
Subject: cvs commit: incubator-myfaces/build bootstrap.xml build.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

schof       2005/04/14 16:03:11

  Modified:    build    bootstrap.xml build.xml
  Log:
  additional changes for release procedure
  
  Revision  Changes    Path
  1.5       +2 -11     incubator-myfaces/build/bootstrap.xml
  
  Index: bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/bootstrap.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- bootstrap.xml	14 Apr 2005 22:27:48 -0000	1.4
  +++ bootstrap.xml	14 Apr 2005 23:03:11 -0000	1.5
  @@ -133,7 +133,7 @@
   
           <!-- publish the nightly bundles -->
           <scp todir="${apache.username}:${apache.password}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/nightly" trust="yes">
  -            <fileset dir="${release.dir}" excludes=".sh"/>
  +            <fileset dir="${release.dir}" excludes="**/*.sh"/>
           </scp>
   
       </target>
  @@ -154,16 +154,7 @@
           <copy todir="${release.dir}">
               <fileset dir="${release.dir}"/>
           </copy>
  -        
  -        <!-- sign files -->
  -        <exec executable="sign" dir="${release.dir}"
  -        
  -        <!-- publish the release bundles -->
  -        <!--
  -        <scp todir="${apache.username}:${apache.password}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/release" trust="yes">
  -            <fileset dir="${release.dir}"/>
  -        </scp>
  -        -->
  +
       </target>
       
       <target name="check">
  
  
  
  1.96      +34 -9     incubator-myfaces/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- build.xml	14 Apr 2005 22:27:48 -0000	1.95
  +++ build.xml	14 Apr 2005 23:03:11 -0000	1.96
  @@ -23,6 +23,7 @@
       <property name="wml.src" location="${project.dir}/src/wml"/>
       <property name="xdoclet.src" location="${project.dir}/src/xdoclet"/>
       <property name="generated.src" location="${project.dir}/src/generated"/>
  +    <property file="sign.script" location="${release.dir}/sign.sh"/>
   
       <!-- Properties -->
       <property file="build.local.properties"/>
  @@ -368,14 +369,25 @@
               depends="prepare, myfaces-jsf-api-jar, myfaces-impl-jar, myfaces-extensions-jar, myfaces-jar, myfaces-wap-jar, javadoc, tlddoc, prepare-bin-release"
               description="creates the binary release file myfaces-x.x.x.tgz (don't forget to adjust manifest.properties!)">
   
  -        <tar destfile="${release.dir}/${bin.release.bundle}.tgz" compression="gzip" >
  +        <property name="bin.release.tgz" value="${release.dir}/${bin.release.bundle}.tgz"/>
  +        <property name="bin.release.zip" value="${release.dir}/${bin.release.bundle}.zip"/>
  +
  +        <tar destfile="${bin.release.tgz}" compression="gzip" >
                <tarfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
           </tar>
  -        <zip destfile="${release.dir}/${bin.release.bundle}.zip" compress="true">
  +        <zip destfile="${bin.release.zip}" compress="true">
               <zipfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
           </zip>
  -        <checksum file="${release.dir}/${bin.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
  -        <checksum file="${release.dir}/${bin.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${bin.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${bin.release.zip}" forceOverwrite="yes" fileext=".md5"/>
  +
  +        <!-- generate/append script for pgp signing of bundle -->
  +        <echo file="${sign.script}" append="true">
  +        gpg -o ${bin.release.tgz}.asc --detach-sig ${bin.release.tgz}
  +        gpg --verify ${bin.release.tgz}.asc ${bin.release.tgz}
  +        gpg -o ${bin.release.zip}.asc --detach-sig ${bin.release.zip}
  +        gpg --verify ${bin.release.zip}.asc ${bin.release.zip}
  +        </echo>                
   
       </target>
   
  @@ -435,14 +447,25 @@
               depends="prepare-src-release"
               description="creates the source release file myfaces-x.x.x-src.tgz (don't forget to adjust manifest.properties!)">
   
  -        <tar destfile="${release.dir}/${src.release.bundle}.tgz" compression="gzip">
  +        <property name="src.release.tgz" value="${release.dir}/${src.release.bundle}.tgz"/>
  +        <property name="src.release.zip" value="${release.dir}/${src.release.bundle}.zip"/>
  +        
  +        <tar destfile="${src.release.tgz}" compression="gzip">
                <tarfileset prefix="${src.release.bundle}" dir="${temp.dir}/${src.release.bundle}"/>
           </tar>
  -        <zip destfile="${release.dir}/${src.release.bundle}.zip" compress="true">
  +        <zip destfile="${src.release.zip}" compress="true">
               <zipfileset prefix="${src.release.bundle}" dir="${temp.dir}/${src.release.bundle}"/>
           </zip>
  -        <checksum file="${release.dir}/${src.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
  -        <checksum file="${release.dir}/${src.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${release.dir}/${src.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${release.dir}/${src.release.zip}" forceOverwrite="yes" fileext=".md5"/>
  +
  +        <!-- generate/append script for pgp signing of bundle -->
  +        <echo file="${sign.script}" append="true">
  +        gpg -o ${src.release.tgz}.asc --detach-sig ${src.release.tgz}
  +        gpg --verify ${src.release.tgz}.asc ${src.release.tgz}
  +        gpg -o ${src.release.zip}.asc --detach-sig ${src.release.zip}
  +        gpg --verify ${src.release.zip}.asc ${src.release.zip}
  +        </echo>                
   
       </target>
   
  @@ -705,6 +728,8 @@
   
       <target name="prepare">
           <mkdir dir="${release.dir}"/>
  +        <!-- remove sign script in case clean target is not run so we don't accidentally append to the old one -->
  +        <delete file="${sign.script}"/>
       </target>
   
       <target name="app-dist" depends="myfaces-jar, myfaces-wap-jar">
  @@ -778,7 +803,7 @@
           <checksum file="${app.release.zip}" forceOverwrite="yes" fileext=".md5"/>        
           
           <!-- generate/append script for pgp signing of bundle -->
  -        <echo file="${release.dir}/sign.sh" append="true">
  +        <echo file="${sign.script}" append="true">
           gpg -o ${app.release.tgz}.asc --detach-sig ${app.release.tgz}
           gpg --verify ${app.release.tgz}.asc ${app.release.tgz}
           gpg -o ${app.release.zip}.asc --detach-sig ${app.release.zip}