svn commit: r1792371 - in /spamassassin/branches/3.4/build: README update_devel

[km...@apache.org]

Author: kmcgrail
Date: Sun Apr 23 15:19:46 2017
New Revision: 1792371

URL: http://svn.apache.org/viewvc?rev=1792371&view=rev
Log:
Continued tweaks on the build process

Modified:
    spamassassin/branches/3.4/build/README
    spamassassin/branches/3.4/build/update_devel

Modified: spamassassin/branches/3.4/build/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/README?rev=1792371&r1=1792370&r2=1792371&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/README (original)
+++ spamassassin/branches/3.4/build/README Sun Apr 23 15:19:46 2017
@@ -44,19 +44,7 @@ SPAMASSASSIN RELEASE PROCEDURE
 
 - First off, checkout the branch or trunk you wish to build.
 
-# log in to spamassassin.zones.apache.org for some preliminary tool
-#  checks.
-#
-#    ssh spamassassin.zones.apache.org
-#
-#- ensure the required code and data is available for the build scripts:
-#  see above.
-#
-#- ensure your PATH is correct:
-#
-#    PATH=$HOME/sabuildtools/bin:$PATH
-
-- ensure ExtUtils::MakeMaker is version 6.46 or later, to create
+- Ensure ExtUtils::MakeMaker is version 6.46 or later, to create
   a detailed-enough META.yml (TODO: this should not be required.)
 
     perl -MExtUtils::MakeMaker -e 'print $ExtUtils::MakeMaker::VERSION'
@@ -92,11 +80,6 @@ SPAMASSASSIN RELEASE PROCEDURE
 
   Full releases: comment out @EXTRA_VERSION
 
-#  [NOTE: when editing files in these instructions, you may have to
-#  use another checkout somewhere else, check in the changes there,
-#  then 'svn update' in the release account -- since I think it
-#  builds from a read-only checkout.]
-
 - Ensure the new version number takes hold:
 
     make clean ; perl Makefile.PL < /dev/null ; make
@@ -207,7 +190,7 @@ SPAMASSASSIN RELEASE PROCEDURE
 
   - For a maintainance release candidate(x.y.1-rc1), pre-release (x.y.1-preZ) or alpha (x.y.1-alphaZ):
 
-    vers=3_4_2_pre_1
+    vers=3_4_2_pre_3
 
     Then run:
 
@@ -263,6 +246,7 @@ SPAMASSASSIN RELEASE PROCEDURE
 
 - run "./build/update_stable" to build the tar.gz, tar.bz2 and zip files.
 
+    killall gpg-agent
     ./build/update_stable
 
   WARNING: this will use the most recently-created "sa-update" tarball for
@@ -278,10 +262,9 @@ SPAMASSASSIN RELEASE PROCEDURE
   latest rules file for the purpose of publishing a starter rule file 
   for people who can't run sa-update:
 
-    PATH=$HOME/sabuildtools/bin:$PATH
     ./build/repackage_latest_update_rules
 
-- test the tar.gz and zip files!  redo until they work!! ;)
+- test the files!  redo until they work!! ;)
 
 - Write the release announcement mail!  This is a simple matter of copying
   the previous release's announcement, updating the version numbers and

Modified: spamassassin/branches/3.4/build/update_devel
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/update_devel?rev=1792371&r1=1792370&r2=1792371&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/update_devel (original)
+++ spamassassin/branches/3.4/build/update_devel Sun Apr 23 15:19:46 2017
@@ -46,6 +46,9 @@ gzip  -f9vc $DISTVNAME.tar > $DISTVNAME.
 bzip2 -f9vc $DISTVNAME.tar > $DISTVNAME.tar.bz2 || exit $?
 zip   -rv - $DISTDNAME     > $DISTVNAME.zip     || exit $?
 
+#Adding information to run gpg-agent so a non-privileged user can sign - There should be a check to see if this is done
+gpg-agent --homedir $HOME/sabuildtools/sasigningkey --daemon --write-env-file "${HOME}/sabuildtools/sasigningkey/.gpg-agent-info"
+
 for ext in tar.bz2 tar.gz zip ; do
   cp $DISTVNAME.$ext $RELDIR
 
@@ -53,8 +56,6 @@ for ext in tar.bz2 tar.gz zip ; do
   perl build/sha1sum.pl $DISTVNAME.$ext > $RELDIR/$DISTVNAME.$ext.sha1 || exit $?
 
   rm -f $DISTVNAME.$ext.asc*
-  #Adding information to run gpg-agent so a non-privileged user can sign
-  gpg-agent --homedir $HOME/sabuildtools/sasigningkey --daemon --write-env-file "${HOME}/sabuildtools/sasigningkey/.gpg-agent-info"
   if [ -d $HOME/sabuildtools/sasigningkey ]; then
     gpg --homedir $HOME/sabuildtools/sasigningkey --detach-sign --sign --armor $DISTVNAME.$ext || exit $?
     mv $DISTVNAME.$ext.asc $RELDIR/$DISTVNAME.$ext.asc || exit $?