svn commit: r609221 - in /spamassassin/trunk/build: README update_devel update_stable

[jm...@apache.org]

Author: jm
Date: Sat Jan  5 13:30:48 2008
New Revision: 609221

URL: http://svn.apache.org/viewvc?rev=609221&view=rev
Log:
update build procedures to remove a redundant step

Modified:
    spamassassin/trunk/build/README
    spamassassin/trunk/build/update_devel
    spamassassin/trunk/build/update_stable

Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?rev=609221&r1=609220&r2=609221&view=diff
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Sat Jan  5 13:30:48 2008
@@ -183,14 +183,6 @@
 
 - take a copy of the MD5sum line output.
 
-- by default, they're written to ~/site/released/ .
-  Copy them to wherever you want, yourself:
-
-    mkdir -p ~/public_html/devel
-    mv ~/site/released/Mail-SpamAssassin-3.2.0-rc2.* ~/public_html/devel
-
-  (For me, "~/public_html/devel" is http://people.apache.org/~jm/devel/ .)
-
 - test the tar.gz and zip files!  redo until they work!! ;)
 
 - Write the release announcement mail!  This is a simple matter of copying

Modified: spamassassin/trunk/build/update_devel
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/update_devel?rev=609221&r1=609220&r2=609221&view=diff
==============================================================================
--- spamassassin/trunk/build/update_devel (original)
+++ spamassassin/trunk/build/update_devel Sat Jan  5 13:30:48 2008
@@ -4,17 +4,15 @@
 
 umask 002
 
-WEBDIR=$SA_WEBDIR
-test -n "$WEBDIR"  || WEBDIR=$HOME/site
+WEBDIR=$HOME/public_html
 
 if [ ! -d $WEBDIR ] ; then
   echo "WARNING: $WEBDIR does not exist" 1>&2
   echo 1>&2
 fi
 
-DEVDIR=$WEBDIR/devel
-RELDIR=$WEBDIR/released
-mkdir -p $DEVDIR $RELDIR
+RELDIR=$WEBDIR/devel
+mkdir -p $RELDIR
 
 DISTNAME=Mail-SpamAssassin
 
@@ -32,9 +30,6 @@
 DISTDNAME=$DISTNAME-$DIST_VERSION
 DISTVNAME=$DISTNAME-$VERSION
 
-# delete old CVS files
-find . -name '.#*' -print | xargs rm -f
-
 make || exit $?
 
 make text_html_doc
@@ -52,15 +47,15 @@
 zip   -rv - $DISTDNAME     > $DISTVNAME.zip     || exit $?
 
 for ext in tar.bz2 tar.gz zip ; do
-  cp $DISTVNAME.$ext $DEVDIR
+  cp $DISTVNAME.$ext $RELDIR
 
-  perl build/md5sum.pl $DISTVNAME.$ext > $DEVDIR/$DISTVNAME.$ext.md5  || exit $?
-  perl build/sha1sum.pl $DISTVNAME.$ext > $DEVDIR/$DISTVNAME.$ext.sha1 || exit $?
+  perl build/md5sum.pl $DISTVNAME.$ext > $RELDIR/$DISTVNAME.$ext.md5  || exit $?
+  perl build/sha1sum.pl $DISTVNAME.$ext > $RELDIR/$DISTVNAME.$ext.sha1 || exit $?
 
   rm -f $DISTVNAME.$ext.asc*
   if [ -d $HOME/sabuildtools/sasigningkey ]; then
     $HOME/sabuildtools/bin/gpg --homedir $HOME/sabuildtools/sasigningkey -bsa $DISTVNAME.$ext || exit $?
-    mv $DISTVNAME.$ext.asc $DEVDIR/$DISTVNAME.$ext.asc || exit $?
+    mv $DISTVNAME.$ext.asc $RELDIR/$DISTVNAME.$ext.asc || exit $?
   fi
 
   rm -f $DISTVNAME.$ext
@@ -69,5 +64,5 @@
 test -f Makefile && make distclean
 rm -f $DISTVNAME.*
 
-chgrp -R spamassassin $DEVDIR $RELDIR
-ls -l $DEVDIR
+chgrp -R spamassassin $RELDIR
+ls -l $RELDIR

Modified: spamassassin/trunk/build/update_stable
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/update_stable?rev=609221&r1=609220&r2=609221&view=diff
==============================================================================
--- spamassassin/trunk/build/update_stable (original)
+++ spamassassin/trunk/build/update_stable Sat Jan  5 13:30:48 2008
@@ -9,15 +9,6 @@
 rm -rf $WEBDIR/doc
 tar cf - --exclude=CVS --exclude='.#*' doc | ( cd $WEBDIR ; tar xf - )
 
-for ext in tar.bz2 tar.gz zip ; do
-  for fxt in '' .asc .md5 .sha1 ; do
-    rm -f $RELDIR/$DISTVNAME.$ext$fxt
-    cp -p $DEVDIR/$DISTVNAME.$ext$fxt $RELDIR || exit $?
-    rm -f $DEVDIR/$DISTVNAME.$ext$fxt
-  done
-done
-
-
 set +x
 echo