Return-Path: 
 <myfaces-cvs-return-765-apmail-incubator-myfaces-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-myfaces-cvs-archive@www.apache.org
Received: (qmail 53835 invoked from network); 14 Apr 2005 22:27:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Apr 2005 22:27:51 -0000
Received: (qmail 81522 invoked by uid 500); 14 Apr 2005 22:27:50 -0000
Delivered-To: apmail-incubator-myfaces-cvs-archive@incubator.apache.org
Received: (qmail 81494 invoked by uid 500); 14 Apr 2005 22:27:50 -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 81477 invoked by uid 99); 14 Apr 2005 22:27:50 -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 15:27:49 -0700
Received: (qmail 53793 invoked by uid 2030); 14 Apr 2005 22:27:48 -0000
Date: 14 Apr 2005 22:27:48 -0000
Message-ID: <20050414222748.53792.qmail@minotaur.apache.org>
From: schof@apache.org
To: incubator-myfaces-cvs@apache.org
Subject: cvs commit: incubator-myfaces/build bootstrap.properties.local.sample
 bootstrap.xml build.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

schof       2005/04/14 15:27:48

  Modified:    build    bootstrap.properties.local.sample bootstrap.xml
                        build.xml
  Log:
  first set of changes to accomodate apache release procedure
  
  Revision  Changes    Path
  1.2       +2 -1      incubator-myfaces/build/bootstrap.properties.local.sample
  
  Index: bootstrap.properties.local.sample
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/bootstrap.properties.local.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- bootstrap.properties.local.sample	31 Mar 2005 03:33:32 -0000	1.1
  +++ bootstrap.properties.local.sample	14 Apr 2005 22:27:48 -0000	1.2
  @@ -1,2 +1,3 @@
   apache.username=foo
  -apache.password=bar
  \ No newline at end of file
  +apache.password=bar
  +release.dir=c:\foo
  \ No newline at end of file
  
  
  
  1.4       +16 -3     incubator-myfaces/build/bootstrap.xml
  
  Index: bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/bootstrap.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- bootstrap.xml	31 Mar 2005 22:18:56 -0000	1.3
  +++ bootstrap.xml	14 Apr 2005 22:27:48 -0000	1.4
  @@ -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}"/>
  +            <fileset dir="${release.dir}" excludes=".sh"/>
           </scp>
   
       </target>
  @@ -147,14 +147,23 @@
           <echo message="build output directory: ${release.dir}"/>
           <mkdir dir="${release.dir}"/>
   
  -        <!-- execute the nightly build file that was just checked out -->
  +        <!-- execute the build file that was just checked out -->
           <ant dir="${build.dir}" target="release" inheritRefs="true"/>
   
  +        <!-- copy files to local release dir -->
  +        <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">
  @@ -162,6 +171,10 @@
           <fail unless="build.version">
               The build.version property must be set.  (ex. ant -buildfile bootstrap.xml -Dbuild.version=1_0_9 clean release)
           </fail>
  +        <!-- make sure user specified a release directory on their local machine (externally) -->
  +        <fail unless="release.dir">
  +            The release.dir property must be set (use command line or bootstrap.local.properies.)
  +        </fail>        
       </target>
   
   </project>
  
  
  
  1.95      +19 -8     incubator-myfaces/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- build.xml	11 Apr 2005 18:50:28 -0000	1.94
  +++ build.xml	14 Apr 2005 22:27:48 -0000	1.95
  @@ -374,8 +374,8 @@
           <zip destfile="${release.dir}/${bin.release.bundle}.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"/>
  -        <checksum file="${release.dir}/${bin.release.bundle}.zip" forceOverwrite="yes"/>
  +        <checksum file="${release.dir}/${bin.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${release.dir}/${bin.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
   
       </target>
   
  @@ -441,8 +441,8 @@
           <zip destfile="${release.dir}/${src.release.bundle}.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"/>
  -        <checksum file="${release.dir}/${src.release.bundle}.zip" forceOverwrite="yes"/>
  +        <checksum file="${release.dir}/${src.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
  +        <checksum file="${release.dir}/${src.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
   
       </target>
   
  @@ -762,17 +762,28 @@
   
       <target name="app-release" depends="prepare, app-dist">
   
  -        <tar destfile="${release.dir}/${app.release.bundle}.tgz" compression="gzip" >
  +        <property name="app.release.tgz" value="${release.dir}/${app.release.bundle}.tgz"/>
  +        <property name="app.release.zip" value="${release.dir}/${app.release.bundle}.zip"/>
  +
  +        <tar destfile="${app.release.tgz}" compression="gzip" >
               <tarfileset prefix="${app.release.bundle}" dir="${webapp.dist.dir}"/>
           </tar>
           
  -        <checksum file="${release.dir}/${app.release.bundle}.tgz" forceOverwrite="yes"/>
  +        <checksum file="${app.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
   
  -        <zip destfile="${release.dir}/${app.release.bundle}.zip" compress="true">
  +        <zip destfile="${app.release.zip}" compress="true">
               <zipfileset prefix="${app.release.bundle}" dir="${webapp.dist.dir}"/>
           </zip>
           
  -        <checksum file="${release.dir}/${app.release.bundle}.zip" forceOverwrite="yes"/>        
  +        <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">
  +        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}
  +        gpg --verify ${app.release.zip}.asc ${app.release.zip}
  +        </echo>                
   
       </target>