svn commit: r1085695 - in /lucene/dev/branches/lucene_solr_3_1/solr: build.xml common-build.xml

[gs...@apache.org]

Author: gsingers
Date: Sat Mar 26 11:15:32 2011
New Revision: 1085695

URL: http://svn.apache.org/viewvc?rev=1085695&view=rev
Log:
cleanup signing, include generating maven artifacts

Modified:
    lucene/dev/branches/lucene_solr_3_1/solr/build.xml
    lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml

Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1085695&r1=1085694&r2=1085695&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Sat Mar 26 11:15:32 2011
@@ -888,8 +888,11 @@
   </target>
   <target name="sign-artifacts" depends="clean-package-signatures"> 
     <!--<property file="${user.home}/.solr/build.properties" />-->
-    <input message="password:>" addproperty="gpg.passphrase">
-      <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+    <available property="gpg.input.handler" classname="org.apache.tools.ant.input.SecureInputHandler"
+      value="org.apache.tools.ant.input.SecureInputHandler"/>
+    <!--else:--><property name="gpg.input.handler" value="org.apache.tools.ant.input.DefaultInputHandler"/>
+      <input message="Enter GPG keystore password: >" addproperty="gpg.passphrase">
+      <handler classname="${gpg.input.handler}" />
     </input>
     <sign-artifact input.file="${package.dir}/${fullnamever}.tgz" output.file="${package.dir}/${fullnamever}.tgz.asc" gpg.passphrase="${gpg.passphrase}"/>
     <sign-artifact input.file="${package.dir}/${fullnamever}.zip" output.file="${package.dir}/${fullnamever}.zip.asc" gpg.passphrase="${gpg.passphrase}"/>
@@ -934,14 +937,14 @@
 	    keyfile="${keyfile}"
       verbose="true"
         >
-      <fileset dir="dist"/>
+      <fileset dir="package"/>
       <fileset dir="${keys.dir}">
         <include name="KEYS"/>
       </fileset>
     </scp>
   </target>
 
-  <target name="prepare-release" depends="clean, svn-up, package, sign-artifacts"
+  <target name="prepare-release" depends="clean, svn-up, package, generate-maven-artifacts, sign-artifacts"
           description="Prototype helper for Committers.  Assumes gpg is in the path"/>
 
   <target name="stage" depends="prepare-release, copy-to-stage"/>

Modified: lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml?rev=1085695&r1=1085694&r2=1085695&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml Sat Mar 26 11:15:32 2011
@@ -414,6 +414,8 @@
     </sequential>
   </macrodef>
 
+  <property name="gpg.exe" value="gpg" />
+  <property name="gpg.key" value="CODE SIGNING KEY" />
   <macrodef name="sign-artifact" description="Signs the artifact">
     <attribute name="input.file"/>
     <attribute name="output.file" default="@{input.file}.asc"/>
@@ -421,10 +423,13 @@
     <sequential>
       <echo >Signing @{input.file} Sig File: @{output.file}</echo>
 
-      <exec executable="gpg" >
+      <exec executable="${gpg.exe}" >
+        <arg value="--batch"/>
         <arg value="--armor"/>
         <arg value="--output"/>
         <arg value="@{output.file}"/>
+        <arg value="--default-key"/>
+        <arg value="${gpg.key}"/>
         <arg value="--passphrase"/>
         <arg value="@{gpg.passphrase}"/>
         <arg value="--detach-sig"/>