summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-28 18:48:55 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-28 18:48:55 (GMT)
commit865bdbf4af88a32cab4d92709fad3c8ae7fb62d5 (patch)
treedb52803bf56a1bbe37e3c5ee4c9be46b0b686f7e
parentb7601676b07c7c8e79af9e7818a783b966612c34 (diff)
downloadcpython-865bdbf4af88a32cab4d92709fad3c8ae7fb62d5.zip
cpython-865bdbf4af88a32cab4d92709fad3c8ae7fb62d5.tar.gz
cpython-865bdbf4af88a32cab4d92709fad3c8ae7fb62d5.tar.bz2
Doc: do not compress .epub for dist, it is already zipped.
-rw-r--r--Doc/Makefile10
-rw-r--r--Doc/tools/sphinxext/download.html4
2 files changed, 4 insertions, 10 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index d85fb94..12fc698 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -136,16 +136,10 @@ dist:
cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip
cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-letter.tar.bz2
- # archive the epub build
+ # copy the epub build
rm -rf build/epub
make epub
- mkdir -p dist/python-$(DISTVERSION)-docs-epub
- cp -pPR build/epub/*.epub dist/python-$(DISTVERSION)-docs-epub/
- tar -C dist -cf dist/python-$(DISTVERSION)-docs-epub.tar python-$(DISTVERSION)-docs-epub
- bzip2 -9 -k dist/python-$(DISTVERSION)-docs-epub.tar
- (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-epub.zip python-$(DISTVERSION)-docs-epub)
- rm -r dist/python-$(DISTVERSION)-docs-epub
- rm dist/python-$(DISTVERSION)-docs-epub.tar
+ cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
check:
$(PYTHON) tools/rstlint.py -i tools
diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html
index 31a53cf..0550111 100644
--- a/Doc/tools/sphinxext/download.html
+++ b/Doc/tools/sphinxext/download.html
@@ -34,8 +34,8 @@ in the table are the size of the download files in megabytes.</p>
<td><a href="{{ dlbase }}/python-{{ release }}-docs-text.tar.bz2">Download</a> (ca. 1.5 MB)</td>
</tr>
<tr><td>EPUB</td>
- <td><a href="{{ dlbase }}/python-{{ release }}-docs-epub.zip">Download</a> (ca. 3.5 MB)</td>
- <td><a href="{{ dlbase }}/python-{{ release }}-docs-epub.tar.bz2">Download</a> (ca. 3.5 MB)</td>
+ <td><a href="{{ dlbase }}/python-{{ release }}-docs.epub">Download</a> (ca. 4.5 MB)</td>
+ <td></td>
</tr>
</table>