You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2019/12/11 22:06:35 UTC

svn commit: r1871200 - in /spamassassin: branches/3.4/build/README branches/3.4/build/update_website_docs trunk/build/README trunk/build/update_website_docs

Author: kmcgrail
Date: Wed Dec 11 22:06:34 2019
New Revision: 1871200

URL: http://svn.apache.org/viewvc?rev=1871200&view=rev
Log:
Updating Build Docs to be clearer

Modified:
    spamassassin/branches/3.4/build/README
    spamassassin/branches/3.4/build/update_website_docs
    spamassassin/trunk/build/README
    spamassassin/trunk/build/update_website_docs

Modified: spamassassin/branches/3.4/build/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/README?rev=1871200&r1=1871199&r2=1871200&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/README (original)
+++ spamassassin/branches/3.4/build/README Wed Dec 11 22:06:34 2019
@@ -1,7 +1,8 @@
 APACHE SPAMASSASSIN RELEASE PROCEDURE
 =====================================
 
-- First off, checkout the branch or trunk you wish to build.
+- First off, checkout the branch or trunk you wish to build.  I usually do
+  this as a privileged user in a build.tmp directory.
 
 - As the release gets close, consider switching to R-T-C development
   mode: https://wiki.apache.org/spamassassin/DevelopmentMode
@@ -246,7 +247,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   - For a maintenance release (x.y.1, x.y.2):
 
-    vers=3_4_2
+    vers=3_4_3
 
     Then run:
 
@@ -257,7 +258,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   - For a maintenance release candidate(x.y.1-rc1), pre-release (x.y.1-preZ) or alpha (x.y.1-alphaZ):
 
-    vers=3_4_2_rc_1
+    vers=3_4_3_rc_1
 
     #Then run:
 
@@ -297,10 +298,9 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
 - Check out the code from the tag you just made:
 
-    #These should be set from the previous command unless you are on a
-    #  different server
-    #vers=3_4_1
-    #repo=https://svn.apache.org/repos/asf/spamassassin
+    #Switch to a non-privileged user
+    vers=3_4_3
+    repo=https://svn.apache.org/repos/asf/spamassassin
     rm -rf ~/relbuild
     svn co $repo/tags/spamassassin_release_$vers ~/relbuild
     cd ~/relbuild
@@ -544,25 +544,25 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   WARNING: edit 'build/update_website_docs' beforehand and set the "PERL"
   "WEBDIR" and "vers" lines.  On my build system, the website checkout is
-  in ~/asf/spamassassin/site and perl is in the path so nothing special is
+  in ~/asf/Mail-SpamAssassin/site and perl is in the path so nothing special is
   needed.
 
-        #If needed, remove the old docs
-        cd ~/asf/spamassassin/site
+        #If needed, remove the old docs - This will be different for v4.0
+        cd ~/asf/Mail-SpamAssassin/site
         svn up
         svn delete --force full/3.4.x
         svn commit -m "removing old doc tree from website" 
 
         #Checkout the current release
         cd /tmp
-        svn checkout https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_2/ release
+        svn checkout https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_3/ release
         cd /tmp/release
         #link your rules and rulesrc
         ln -s ~/usr/src/Mail-SpamAssassin/trunk/rules
         ln -s ~/usr/src/Mail-SpamAssassin/trunk/rulesrc 
         build/update_website_docs
 
-        cd ~/asf/spamassassin/site
+        cd ~/asf/Mail-Spamassassin/site
         svn add full/3.4.x
         svn commit -m "updating new doc tree on website" full
 

Modified: spamassassin/branches/3.4/build/update_website_docs
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/build/update_website_docs?rev=1871200&r1=1871199&r2=1871200&view=diff
==============================================================================
--- spamassassin/branches/3.4/build/update_website_docs (original)
+++ spamassassin/branches/3.4/build/update_website_docs Wed Dec 11 22:06:34 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-WEBDIR=~/asf/spamassassin/site
+WEBDIR=~/asf/Mail-SpamAssassin/site
 vers=3.4.x
 
 PERL=/usr/bin/perl

Modified: spamassassin/trunk/build/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/README?rev=1871200&r1=1871199&r2=1871200&view=diff
==============================================================================
--- spamassassin/trunk/build/README (original)
+++ spamassassin/trunk/build/README Wed Dec 11 22:06:34 2019
@@ -1,7 +1,8 @@
 APACHE SPAMASSASSIN RELEASE PROCEDURE
 =====================================
 
-- First off, checkout the branch or trunk you wish to build.
+- First off, checkout the branch or trunk you wish to build.  I usually do
+  this as a privileged user in a build.tmp directory.
 
 - As the release gets close, consider switching to R-T-C development
   mode: https://wiki.apache.org/spamassassin/DevelopmentMode
@@ -246,7 +247,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   - For a maintenance release (x.y.1, x.y.2):
 
-    vers=3_4_2
+    vers=3_4_3
 
     Then run:
 
@@ -257,7 +258,7 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   - For a maintenance release candidate(x.y.1-rc1), pre-release (x.y.1-preZ) or alpha (x.y.1-alphaZ):
 
-    vers=3_4_2_rc_1
+    vers=3_4_3_rc_1
 
     #Then run:
 
@@ -297,10 +298,9 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
 - Check out the code from the tag you just made:
 
-    #These should be set from the previous command unless you are on a
-    #  different server
-    #vers=3_4_1
-    #repo=https://svn.apache.org/repos/asf/spamassassin
+    #Switch to a non-privileged user
+    vers=3_4_3
+    repo=https://svn.apache.org/repos/asf/spamassassin
     rm -rf ~/relbuild
     svn co $repo/tags/spamassassin_release_$vers ~/relbuild
     cd ~/relbuild
@@ -544,25 +544,25 @@ APACHE SPAMASSASSIN RELEASE PROCEDURE
 
   WARNING: edit 'build/update_website_docs' beforehand and set the "PERL"
   "WEBDIR" and "vers" lines.  On my build system, the website checkout is
-  in ~/asf/spamassassin/site and perl is in the path so nothing special is
+  in ~/asf/Mail-SpamAssassin/site and perl is in the path so nothing special is
   needed.
 
-        #If needed, remove the old docs
-        cd ~/asf/spamassassin/site
+        #If needed, remove the old docs - This will be different for v4.0
+        cd ~/asf/Mail-SpamAssassin/site
         svn up
         svn delete --force full/3.4.x
         svn commit -m "removing old doc tree from website" 
 
         #Checkout the current release
         cd /tmp
-        svn checkout https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_2/ release
+        svn checkout https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_3_4_3/ release
         cd /tmp/release
         #link your rules and rulesrc
         ln -s ~/usr/src/Mail-SpamAssassin/trunk/rules
         ln -s ~/usr/src/Mail-SpamAssassin/trunk/rulesrc 
         build/update_website_docs
 
-        cd ~/asf/spamassassin/site
+        cd ~/asf/Mail-Spamassassin/site
         svn add full/3.4.x
         svn commit -m "updating new doc tree on website" full
 

Modified: spamassassin/trunk/build/update_website_docs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/update_website_docs?rev=1871200&r1=1871199&r2=1871200&view=diff
==============================================================================
--- spamassassin/trunk/build/update_website_docs (original)
+++ spamassassin/trunk/build/update_website_docs Wed Dec 11 22:06:34 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-WEBDIR=~/asf/spamassassin/site
+WEBDIR=~/asf/Mail-SpamAssassin/site
 vers=3.4.x
 
 PERL=/usr/bin/perl