On Jun 21, 2011, at 8:38 PM, Warren Togami Jr. wrote: > The instructions are confusing and do not appear to reflect reality. I do > not want to risk breaking anything by digging deeper when I have insufficient > time to fix it if anything goes wrong. > >> - update the 'doc' tree in the SpamAssassin website (WARNING: if you're >> moving to a new major release, x.y.0, you need to edit >> 'build/update_website_docs' beforehand and set the "vers" line): >> >> cd /var/www/buildbot.spamassassin.org/staging/website >> svn up >> svn delete --force full/3.3.x >> svn commit -m "removing old doc tree from website" full > > Given that /var/www does not exist on people.apache.org, it appears this can > only be run on spamassassin.zones.apache.org. This step succeeded there. > >> >> cd [checkedoutdir] >> build/update_website_docs > > It wasn't clear what exactly [checkedoutdir] meant, but this succeeded in a > private checkout of spamassassin-3.3 on people.apache.org with Kevin's new > perl-5.14. This script expects /www/spamassassin.apache.org to exist for it > to complete without errors. > >> >> cd /var/www/buildbot.spamassassin.org/staging/website >> svn add full/3.3.x >> svn commit -m "updating new doc tree on website" full > > On people.apache.org, /var/www does not exist. /www/buildbot.spamassassin.org > does not exist either. Going back to spamassassin.zones.apache.org, > /var/www/buildbot.spamassassin.org/staging/website does exist, but there > exists no full/3.3.x/ directory. > > Who did this last time? Were you following the build/README directions to > the letter?
Agree, things are confusing, but I think it's pretty easy to work through the steps and jump over whatever places that need to be fixed. I ended up doing it in a very hackish way because my shell on the zones machine was goofed up and I didn't feel like fighting it. I think we can greatly simplify things, but don't have a whole lot of time to update the document. I've got the docs committed and the live website is now updated. The files were not in the dist/spamassassin/source directory so I copied those over and updated the download link timestamp. I re-ran webmake and pushed the changes to the live site. Just waiting on the live site to get rsync'd now. I updated the tag and am currently uploading the CPAN. I'll leave it to you to send out the announce to all the various lists. Michael > > Warren
