From 5ca370827d88817eeca3c56cbb37e4ddccc16c6e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Feb 2014 04:50:52 -0500
Subject: Construct the website in build directory

---
 Makefile                |  8 +++++---
 doc/release-process.rst | 33 ++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 82dc6ca..c45a310 100644
--- a/Makefile
+++ b/Makefile
@@ -62,9 +62,11 @@ windist: distclean
 	python2.4 setup_win32_ssl.py bdist_wininst
 	rm -rf build
 
-docs:
-	cd doc && for file in *.rst; do rst2html "$$file" ../www/htdocs/doc/`echo "$$file" |sed -e 's/.rst$$/.html/'`; done
-	rst2html RELEASE-NOTES.rst www/htdocs/release-notes.html
+www docs:
+	mkdir -p build
+	rsync -av www build
+	cd doc && for file in *.rst; do rst2html "$$file" ../build/www/htdocs/doc/`echo "$$file" |sed -e 's/.rst$$/.html/'`; done
+	rst2html RELEASE-NOTES.rst build/www/htdocs/release-notes.html
 
 
 .PHONY: all build test do-test strip install install_lib clean distclean maintainer-clean dist sdist windist
diff --git a/doc/release-process.rst b/doc/release-process.rst
index db8260e..e967f41 100644
--- a/doc/release-process.rst
+++ b/doc/release-process.rst
@@ -8,24 +8,23 @@ Release Process
    be included in binary distributions.
 4. Make sure travis is green for master.
 5. Update version numbers in:
-   - Changelog
+   - Changelog (also record release date)
    - setup.py
    - winbuild.py
    - www/htdocs/index.php (also update release date)
-6. Copy Changelog to www/htdocs.
-7. Draft release notes, add to RELEASE-NOTES.rst.
-8. ``make docs``.
-9. ``python setup.py sdist``.
-10. Manually test install the built package.
-11. Build windows packages using winbuild.py.
-12. Add windows packages to downloads repo on github.
-13. Tag the new version.
-14. Register new version with pypi - ``python setup.py register``.
-15. Upload source distribution to pypi - ``python setup.py sdist upload``.
+6. Draft release notes, add to RELEASE-NOTES.rst.
+7. ``make docs``.
+8. ``python setup.py sdist``.
+9. Manually test install the built package.
+10. Build windows packages using winbuild.py.
+11. Add windows packages to downloads repo on github.
+12. Tag the new version.
+13. Register new version with pypi - ``python setup.py register``.
+14. Upload source distribution to pypi - ``python setup.py sdist upload``.
     This recreates the source distribution.
-16. Add the source distribution to downloads repo on github.
-17. Rsync downloads repo to sourceforge.
-18. Rsync www/htdocs to sourceforge.
-19. Push tag to github pycurl repo.
-20. Announce release on mailing list.
-21. Link to announcement from website.
+15. Add the source distribution to downloads repo on github.
+16. Rsync downloads repo to sourceforge.
+17. Rsync build/www/htdocs to sourceforge.
+18. Push tag to github pycurl repo.
+19. Announce release on mailing list.
+20. Link to announcement from website.
-- 
cgit v1.2.1