diff options
| author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2018-08-14 02:07:50 +0300 |
|---|---|---|
| committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2018-08-14 03:51:33 +0300 |
| commit | 57e63599205f5cba75c119b44d253ed7cc65771d (patch) | |
| tree | a328bfedd28e39417334cb1a9dd8b06044faa68f /doc | |
| parent | 7d8477e0190d2b8b661eebf4e110831f2c3a9805 (diff) | |
PyDoc: Remove hack to rename main doc from 'contents' to 'index'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 5 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 3 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_update.py | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 2195f49ba1b..b542eb46c9d 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1679,7 +1679,7 @@ def write_rst_contents(basepath): ''' Write the rst file of the main page, needed for sphinx (index.html) ''' - filepath = os.path.join(basepath, "contents.rst") + filepath = os.path.join(basepath, "index.rst") file = open(filepath, "w", encoding="utf-8") fw = file.write @@ -1692,7 +1692,6 @@ def write_rst_contents(basepath): # fw("`A PDF version of this document is also available <%s>`_\n" % BLENDER_PDF_FILENAME) fw("This site can be downloaded for offline use `Download the full Documentation (zipped HTML files) <%s>`_\n" % BLENDER_ZIP_FILENAME) - fw("\n") if not EXCLUDE_INFO_DOCS: @@ -2109,8 +2108,6 @@ def main(): shutil.copytree(SPHINX_OUT, REFERENCE_PATH, ignore=shutil.ignore_patterns(*ignores)) - shutil.copy(os.path.join(REFERENCE_PATH, "contents.html"), - os.path.join(REFERENCE_PATH, "index.html")) # zip REFERENCE_PATH basename = os.path.join(ARGS.output_dir, REFERENCE_NAME) diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index b3bdd386f8c..0c1f531ffac 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -122,7 +122,6 @@ fi if $DO_UPLOAD ; then - cp $SPHINX_WORKDIR/sphinx-out/contents.html $SPHINX_WORKDIR/sphinx-out/index.html ssh $SSH_USER@blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*' rsync --progress -ave "ssh -p 22" $SPHINX_WORKDIR/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/ @@ -161,5 +160,5 @@ fi echo "" echo "Finished! view the docs from: " -if $DO_OUT_HTML ; then echo " html:" $SPHINX_WORKDIR/sphinx-out/contents.html ; fi +if $DO_OUT_HTML ; then echo " html:" $SPHINX_WORKDIR/sphinx-out/index.html ; fi if $DO_OUT_PDF ; then echo " pdf:" $SPHINX_WORKDIR/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf ; fi diff --git a/doc/python_api/sphinx_doc_update.py b/doc/python_api/sphinx_doc_update.py index af44137aca4..702151317b3 100755 --- a/doc/python_api/sphinx_doc_update.py +++ b/doc/python_api/sphinx_doc_update.py @@ -163,7 +163,6 @@ def main(): os.rename(zip_path, os.path.join(api_dir, "%s.zip" % zip_name)) # VII) Create symlinks and html redirects. - os.symlink("./contents.html", os.path.join(api_dir, "index.html")) if is_release: symlink = os.path.join(args.mirror_dir, "current") os.remove(symlink) |