svn commit: r426974 - in /spamassassin/branches/3.1/build: README update_website_docs

[jm...@apache.org]

Author: jm
Date: Sun Jul 30 15:51:10 2006
New Revision: 426974

URL: http://svn.apache.org/viewvc?rev=426974&view=rev
Log:
update build script and README based on trunk work for bug 4998

Modified:
    spamassassin/branches/3.1/build/README
    spamassassin/branches/3.1/build/update_website_docs

Modified: spamassassin/branches/3.1/build/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/build/README?rev=426974&r1=426973&r2=426974&view=diff
==============================================================================
--- spamassassin/branches/3.1/build/README (original)
+++ spamassassin/branches/3.1/build/README Sun Jul 30 15:51:10 2006
@@ -235,6 +235,18 @@
         cd /www/spamassassin.apache.org
         webmake -F
 
+- update the 'dist' tree in the SpamAssassin website:
+
+        build/update_website_docs
+
+- and check the entire website into SVN (see bug 4998 for reasons why).
+  Note that you may need to resolve conflicts and ensure the contents of
+  'full/3.1.x' are all added successfully:
+
+        svn up
+        svn add full/3.1.x
+        svn commit -m "added new release"
+
 - upload to CPAN at http://pause.cpan.org/
 
   ( https://pause.perl.org/pause/authenquery?ACTION=add_uri )

Modified: spamassassin/branches/3.1/build/update_website_docs
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/build/update_website_docs?rev=426974&r1=426973&r2=426974&view=diff
==============================================================================
--- spamassassin/branches/3.1/build/update_website_docs (original)
+++ spamassassin/branches/3.1/build/update_website_docs Sun Jul 30 15:51:10 2006
@@ -11,28 +11,30 @@
   fi
 fi
 
-find . -name '.#*' -print | xargs rm -f # delete old CVS files
+fulldir=$WEBDIR/full/$vers
+[ -d $fulldir ] || mkdir -p $fulldir
 
-[ -d $WEBDIR/full/$vers ] || mkdir -p $WEBDIR/full/$vers
 $PERL Makefile.PL PERL=$PERL < /dev/null
-make; make text_html_doc 
+make
+make text_html_doc || exit 1
 
-rm -rf $WEBDIR/full/dist
-mkdir $WEBDIR/full/dist
-tar cf - --exclude=CVS --exclude='.#*'  \
-         --exclude='logs' --exclude='*.tar.gz' --exclude='*.zip' \
-         --exclude='*.log' --exclude='*.o' \
-         --exclude='o' --exclude='out' \
-         --exclude='tst' \
-         --exclude='blib' --exclude='Mail-SpamAssassin-*' \
-         . | ( cd $WEBDIR/full/dist ; tar xf - )
+rm -rf $fulldir/dist
+mkdir $fulldir/dist
+tar cf - \
+        --exclude=CVS --exclude='.#*'  \
+        --exclude=.svn \
+        --exclude='logs' --exclude='*.tar.gz' --exclude='*.zip' \
+        --exclude='*.log' --exclude='*.o' \
+        --exclude='o' --exclude='out' \
+        --exclude='tst' \
+        --exclude='blib' --exclude='Mail-SpamAssassin-*' \
+        . | ( cd $fulldir/dist ; tar xf - )
         
-rm -rf $WEBDIR/full/$vers/dist
-mv $WEBDIR/full/dist $WEBDIR/full/$vers/dist
-
-( cd $WEBDIR/full/$vers/dist;
-  tar cf docbak doc;
-  make clean distclean;
-  tar xvf docbak ; rm -f docbak
+(
+  cd $fulldir/dist
+  tar cf docbak doc
+  make clean distclean
+  tar xvf docbak
+  rm -f docbak
 )