Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6518C6A2C for ; Sat, 28 May 2011 08:47:24 +0000 (UTC) Received: (qmail 81375 invoked by uid 500); 28 May 2011 08:47:22 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 81319 invoked by uid 500); 28 May 2011 08:47:22 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 81310 invoked by uid 99); 28 May 2011 08:47:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 May 2011 08:47:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 May 2011 08:47:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3DC662388901; Sat, 28 May 2011 08:47:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128570 - in /tomcat/jk/trunk/tools: jkrelease.sh signfile.sh Date: Sat, 28 May 2011 08:47:00 -0000 To: dev@tomcat.apache.org From: timw@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110528084700.3DC662388901@eris.apache.org> Author: timw Date: Sat May 28 08:46:59 2011 New Revision: 1128570 URL: http://svn.apache.org/viewvc?rev=1128570&view=rev Log: Adding ability to specify code signing key in release script, and failing release when tar fails (default BSD tar on OS X borks) Modified: tomcat/jk/trunk/tools/jkrelease.sh tomcat/jk/trunk/tools/signfile.sh Modified: tomcat/jk/trunk/tools/jkrelease.sh URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1128570&r1=1128569&r2=1128570&view=diff ============================================================================== --- tomcat/jk/trunk/tools/jkrelease.sh (original) +++ tomcat/jk/trunk/tools/jkrelease.sh Sat May 28 08:46:59 2011 @@ -54,6 +54,7 @@ usage() { echo " -T: package from trunk" echo " -d: package from local directory" echo " -p: GNU PG passphrrase used for signing" + echo " -k: ID of GNU PG key to use for signing" } copy_files() { @@ -72,14 +73,15 @@ copy_files() { #################### MAIN ############## conflict=0 -while getopts :v:t:r:b:d:p:Tf c +while getopts :v:t:r:b:d:p:k:Tf c do case $c in v) version=$OPTARG;; t) tag=$OPTARG conflict=$(($conflict+1));; r) revision=$OPTARG;; - p) SIGN_OPTS="--passphrase=$OPTARG";; + k) SIGN_OPTS="--default-key=$OPTARG $SIGN_OPTS";; + p) SIGN_OPTS="--passphrase=$OPTARG $SIGN_OPTS";; b) branch=$OPTARG conflict=$(($conflict+1));; T) trunk=trunk @@ -306,7 +308,7 @@ fi cd ../../ # Pack -tar cfz ${JK_DIST}.tar.gz --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST} +tar cfz ${JK_DIST}.tar.gz --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST} || exit 1 perl ${JK_DIST}/tools/lineends.pl --cr ${JK_DIST} zip -9 -r ${JK_DIST}.zip ${JK_DIST} Modified: tomcat/jk/trunk/tools/signfile.sh URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/signfile.sh?rev=1128570&r1=1128569&r2=1128570&view=diff ============================================================================== --- tomcat/jk/trunk/tools/signfile.sh (original) +++ tomcat/jk/trunk/tools/signfile.sh Sat May 28 08:46:59 2011 @@ -25,6 +25,10 @@ do ;; esac case "$o" in + --default-key=* ) + gpgopts="$gpgopts --default-key $a" + shift + ;; --passphrase=* ) gpgopts="$gpgopts --passphrase $a" shift --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org