[Python-checkins] r78923 - in python/branches/release26-maint: Doc/Makefile Doc/tools/sphinxext/download.html

[georg.brandl]

Author: georg.brandl
Date: Sat Mar 13 14:42:13 2010
New Revision: 78923

Log:
Merged revisions 78921 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78921 | georg.brandl | 2010-03-13 14:39:46 +0100 (Sa, 13 Mär 2010) | 1 line
  
  Change/fix handling of docs download location: for daily builds, put them right next to the HTML.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/Makefile
   python/branches/release26-maint/Doc/tools/sphinxext/download.html

Modified: python/branches/release26-maint/Doc/Makefile
==============================================================================
--- python/branches/release26-maint/Doc/Makefile	(original)
+++ python/branches/release26-maint/Doc/Makefile	Sat Mar 13 14:42:13 2010
@@ -157,16 +157,17 @@
 check:
 	$(PYTHON) tools/rstlint.py -i tools
 
-# Targets for automatic doc build
+# Targets for daily automated doc build
 
 # for development releases: always build
 autobuild-dev:
 	make update
-	make dist
+	make dist SPHINXOPTS='-A daily=1'
 
-# for stable releases: only build if not in development mode
+# for stable releases: only build if not in pre-release stage (alpha, beta, rc)
 autobuild-stable:
 	@case $(DISTVERSION) in *[abc]*) \
-		echo "Not building; not a release version.";  exit 1;; \
+		echo "Not building; $(DISTVERSION) is not a release version."; \
+		exit 1;; \
 	esac
 	@make autobuild-dev

Modified: python/branches/release26-maint/Doc/tools/sphinxext/download.html
==============================================================================
--- python/branches/release26-maint/Doc/tools/sphinxext/download.html	(original)
+++ python/branches/release26-maint/Doc/tools/sphinxext/download.html	Sat Mar 13 14:42:13 2010
@@ -1,15 +1,14 @@
 {% extends "layout.html" %}
 {% set title = 'Download' %}
-{% set dlbase = 'http://docs.python.org/ftp/python/doc/current' %}
-{% block body %}
+{% if daily is defined %}
+  {% set dlbase = pathto('archives', 1) %}
+{% else %}
+  {% set dlbase = 'http://docs.python.org/ftp/python/doc/' + release %}
+{% endif %}
 
+{% block body %}
 <h1>Download Python {{ release }} Documentation</h1>
 
-{% if 'a' in release or 'b' in release or 'c' in release %}
-<p>We don't package the documentation for development releases for download.
-  Downloads will be available for the final release.</p>
-
-{% else %}
 {% if last_updated %}<p><b>Last updated on: {{ last_updated }}.</b></p>{% endif %}
 
 <p>To download an archive containing all the documents for this version of
@@ -55,6 +54,4 @@
 
 <p>If you have comments or suggestions for the Python documentation, please send
 email to <a href="mailto:docs at python.org">docs at python.org</a>.</p>
-{% endif %}
-
 {% endblock %}