Return-Path: 
 <dev-return-123818-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
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 412D3BF0A
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Mon, 16 Jan 2012 11:29:56 +0000 (UTC)
Received: (qmail 58001 invoked by uid 500); 16 Jan 2012 11:29:55 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 57911 invoked by uid 500); 16 Jan 2012 11:29:54 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 57902 invoked by uid 99); 16 Jan 2012 11:29:54 -0000
Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2012 11:29:54 +0000
Received: from localhost (HELO [192.168.23.9]) (127.0.0.1)
  (smtp-auth username markt, mechanism plain)
  by minotaur.apache.org (qpsmtpd/0.29) with ESMTP;
 Mon, 16 Jan 2012 11:29:54 +0000
Message-ID: <4F140A2B.2020309@apache.org>
Date: Mon, 16 Jan 2012 11:29:47 +0000
From: Mark Thomas <markt@apache.org>
User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64;
 rv:8.0) Gecko/20111105 Thunderbird/8.0
MIME-Version: 1.0
To: Tomcat Developers List <dev@tomcat.apache.org>
Subject: Re: svn commit: r1231923 - in /tomcat/trunk: build.properties.default
 build.xml
References: <20120116111112.64EA823889E1@eris.apache.org>
 <CABzHfVk2knLn4A2eG-bxWPc5oa1FSCnQLvyB93j0VXd+JWE9UQ@mail.gmail.com>
In-Reply-To: 
 <CABzHfVk2knLn4A2eG-bxWPc5oa1FSCnQLvyB93j0VXd+JWE9UQ@mail.gmail.com>
X-Enigmail-Version: 1.3.4
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

On 16/01/2012 11:26, Konstantin Kolinko wrote:
> How to avoid being asked for passphrase if
> 1. I do not have gpg installed
> 2. Do not want to generate asc files
> 
> It seems that buildbot also has problem with this.
> 
> Maybe check that "gpg.exec" points to an existing executable.

I'll add another property. I was trying to avoid having to do that.

Mark

> 
> 
> 2012/1/16  <markt@apache.org>:
>> Author: markt
>> Date: Mon Jan 16 11:11:11 2012
>> New Revision: 1231923
>>
>> URL: http://svn.apache.org/viewvc?rev=1231923&view=rev
>> Log:
>> Automate OpenPGP signature generation for release process.
>>
>> Modified:
>>    tomcat/trunk/build.properties.default
>>    tomcat/trunk/build.xml
>>
>> Modified: tomcat/trunk/build.properties.default
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1231923&r1=1231922&r2=1231923&view=diff
>> ==============================================================================
>> --- tomcat/trunk/build.properties.default (original)
>> +++ tomcat/trunk/build.properties.default Mon Jan 16 11:11:11 2012
>> @@ -46,6 +46,9 @@ test.accesslog=false
>>  # Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721
>>  test.jvmarg.egd=-Djava.security.egd=file:/dev/./urandom
>>
>> +# Location of GPG executable (used only for releases)
>> +gpg.exec=/path/to/gpg
>> +
>>  # ----- Default Base Path for Dependent Packages -----
>>  # Please note this path must be absolute, not relative,
>>  # as it is referenced with different working directory
>>
>> Modified: tomcat/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231923&r1=1231922&r2=1231923&view=diff
>> ==============================================================================
>> --- tomcat/trunk/build.xml (original)
>> +++ tomcat/trunk/build.xml Mon Jan 16 11:11:11 2012
>> @@ -1724,7 +1724,7 @@ Apache Tomcat ${version} native binaries
>>   </target>
>>
>>   <target name="release"
>> -    depends="clean,clean-depend,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
>> +    depends="clean,clean-depend,release-init,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,javadoc,package-docs-tgz,package-src-zip,package-src-tgz,package-src-jar"
>>     description="Create a Tomcat 8 packaged distribution">
>>
>>     <copy file="KEYS"
>> @@ -1758,11 +1758,19 @@ Apache Tomcat ${version} native binaries
>>         <include name="*.zip"/>
>>         <include name="*.tar.gz"/>
>>         <include name="*.md5"/>
>> +        <include name="*.asc"/>
>>       </fileset>
>>     </copy>
>>
>>   </target>
>>
>> +  <!-- Sets properties only required for releases -->
>> +  <target name="release-init">
>> +    <input message="Enter GPG pass-phrase" addproperty="gpg.passphrase" >
>> +      <handler type="secure"/>
>> +    </input>
>> +  </target>
>> +
>>   <!-- Packages the core zip distro -->
>>   <target name="package-zip" depends="dist-static">
>>     <fixcrlf srcdir="${tomcat.dist}" eol="crlf"
>> @@ -2528,6 +2536,26 @@ Read the Building page on the Apache Tom
>>     <basename file="${file}" property="filename" />
>>     <checksum file="${file}" property="value" />
>>     <echo file="${file}.md5" message="${value}${md5sum.binary-prefix}${filename}" />
>> +    <!-- Anything that requires an md5 hash, also needs a signature -->
>> +    <antcall target="sign" >
>> +      <param name="file" value="${file}" />
>> +    </antcall>
>> +  </target>
>> +
>> +  <!-- Helper target, used to create a detached ascii OpenPGP signature.     -->
>> +  <!-- Uses GPG with default key. Requires 'file' as a parameter. Only       -->
>> +  <!-- executes if gpg passphrase is set which is only set when using the    -->
>> +  <!-- release target.                                                       -->
>> +  <target name="sign" if="gpg.passphrase">
>> +    <fail unless="file" />
>> +    <exec executable="${gpg.exec}" failonerror="true"
>> +          inputstring="${gpg.passphrase}">
>> +      <arg value="--passphrase-fd"/>
>> +      <arg value="0"/>
>> +      <arg value="-a"/>
>> +      <arg value="-b"/>
>> +      <arg value="${file}"/>
>> +    </exec>
>>   </target>
>>
>>  </project>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org