[Bf-blender-cvs] [15539f7b6d1] blender-v2.81-release: Py API doc generator: tweak to handle new release process.

Mon Oct 14 17:39:36 CEST 2019

Commit: 15539f7b6d12ef4b82ebe5a05b0eaa44cb831663
Author: Bastien Montagne
Date:   Mon Oct 14 17:36:27 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rB15539f7b6d12ef4b82ebe5a05b0eaa44cb831663

Py API doc generator: tweak to handle new release process.

We need to handle beta stage in a specific way, since it's no longer
master, but not yet 'real' rc/release stage...

For now, only point to version dir of the API doc, but no need to create
any symlink (that way, 'current' remain pointing to 2.80 release, while
'2.81' is no longer a symlink to 'master', but its own actual doc).

===================================================================

M	doc/python_api/sphinx_doc_update.py

===================================================================

diff --git a/doc/python_api/sphinx_doc_update.py b/doc/python_api/sphinx_doc_update.py
index 995991c4afd..670f57f3ced 100755
--- a/doc/python_api/sphinx_doc_update.py
+++ b/doc/python_api/sphinx_doc_update.py
@@ -118,11 +118,13 @@ def main():
             "import sys, bpy\n"
             "with open(sys.argv[-1], 'w') as f:\n"
             "    is_release = bpy.app.version_cycle in {'rc', 'release'}\n"
+            "    is_beta = bpy.app.version_cycle in {'beta'}\n"
             "    branch = bpy.app.build_branch.split()[0].decode()\n"
             "    f.write('%d\\n' % is_release)\n"
+            "    f.write('%d\\n' % is_beta)\n"
             "    f.write('%s\\n' % branch)\n"
             "    f.write('%d.%d%s\\n' % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)\n"
-            "            if is_release else '%s\\n' % branch)\n"
+            "            if (is_release or is_beta) else '%s\\n' % branch)\n"
             "    f.write('%d_%d%s_release' % (bpy.app.version[0], bpy.app.version[1], bpy.app.version_char)\n"
             "            if is_release else '%d_%d_%d' % bpy.app.version)\n"
         )
@@ -130,8 +132,9 @@ def main():
                        "--python-expr", getver_script, "--", getver_file)
         subprocess.run(get_ver_cmd)
         with open(getver_file) as f:
-            is_release, branch, blenver, blenver_zip = f.read().split("\n")
+            is_release, is_beta, branch, blenver, blenver_zip = f.read().split("\n")
             is_release = bool(int(is_release))
+            is_beta = bool(int(is_beta))
         os.remove(getver_file)
 
         # IV) Build doc.
@@ -146,7 +149,10 @@ def main():
         api_name = blenver
         api_dir = os.path.join(args.mirror_dir, api_name)
         if os.path.exists(api_dir):
-            shutil.rmtree(api_dir)
+            if os.path.islink(api_dir):
+                os.remove(api_dir)
+            else:
+                shutil.rmtree(api_dir)
         os.rename(os.path.join(tmp_dir, "sphinx-out"), api_dir)
 
     # VI) Create zip archive.
@@ -168,6 +174,9 @@ def main():
         with open(os.path.join(args.mirror_dir, "250PythonDoc/index.html"), 'w') as f:
             f.write("<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\""
                     "content=\"0;url=../%s/\"></head><body>Redirecting...</body></html>" % api_name)
+    elif is_beta:
+        # We do not have any particular symlink for that stage.
+        pass
     elif branch == "master":
         with open(os.path.join(args.mirror_dir, "blender_python_api/index.html"), 'w') as f:
             f.write("<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\""

