mirror of https://github.com/python/cpython.git
Change/fix handling of docs download location: for daily builds, put them right next to the HTML.
This commit is contained in:
parent
1b51c3d4de
commit
e82110f3a5
|
@ -161,16 +161,17 @@ check:
|
||||||
serve:
|
serve:
|
||||||
../Tools/scripts/serve.py build/html
|
../Tools/scripts/serve.py build/html
|
||||||
|
|
||||||
# Targets for automatic doc build
|
# Targets for daily automated doc build
|
||||||
|
|
||||||
# for development releases: always build
|
# for development releases: always build
|
||||||
autobuild-dev:
|
autobuild-dev:
|
||||||
make update
|
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:
|
autobuild-stable:
|
||||||
@case $(DISTVERSION) in *[abc]*) \
|
@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
|
esac
|
||||||
@make autobuild-dev
|
@make autobuild-dev
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
{% extends "layout.html" %}
|
{% extends "layout.html" %}
|
||||||
{% set title = 'Download' %}
|
{% set title = 'Download' %}
|
||||||
{% set dlbase = 'http://docs.python.org/ftp/python/doc/' + release %}
|
{% if daily is defined %}
|
||||||
{% block body %}
|
{% 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>
|
<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 %}
|
{% 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
|
<p>To download an archive containing all the documents for this version of
|
||||||
|
@ -55,6 +54,4 @@ <h2>Problems</h2>
|
||||||
|
|
||||||
<p>If you have comments or suggestions for the Python documentation, please send
|
<p>If you have comments or suggestions for the Python documentation, please send
|
||||||
email to <a href="mailto:docs@python.org">docs@python.org</a>.</p>
|
email to <a href="mailto:docs@python.org">docs@python.org</a>.</p>
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue