diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-13 21:49:39 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-19 13:36:02 +0300 |
| commit | e57a1bb86be2aa2144fc44d4531c2956c36791d6 (patch) | |
| tree | 4095e70b0a3153060ccd9ad3e397644547023ff2 | |
| parent | 4697e491b436c6e725d56b83d2c2ec282c3747b2 (diff) | |
API generating script: give better version for releases builds.
Was giving '2.62.1 <sha1>' even for releases, now rather giving nicer
'2.62a <sha1>' in that case.
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 7ad3bab1557..1827f809bc5 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -417,19 +417,28 @@ MODULE_GROUPING = { # -------------------------------BLENDER---------------------------------------- blender_version_strings = [str(v) for v in bpy.app.version] +is_release = bpy.app.version_cycle in {"rc", "release"} # converting bytes to strings, due to T30154 BLENDER_REVISION = str(bpy.app.build_hash, 'utf_8') BLENDER_DATE = str(bpy.app.build_date, 'utf_8') -BLENDER_VERSION_DOTS = ".".join(blender_version_strings) # '2.62.1' +if is_release: + # '2.62a' + BLENDER_VERSION_DOTS = ".".join(blender_version_strings[:2]) + bpy.app.version_char +else: + # '2.62.1' + BLENDER_VERSION_DOTS = ".".join(blender_version_strings) if BLENDER_REVISION != "Unknown": - BLENDER_VERSION_DOTS += " " + BLENDER_REVISION # '2.62.1 SHA1' + # '2.62a SHA1' (release) or '2.62.1 SHA1' (non-release) + BLENDER_VERSION_DOTS += " " + BLENDER_REVISION -BLENDER_VERSION_PATH = "_".join(blender_version_strings) # '2_62_1' -if bpy.app.version_cycle in {"rc", "release"}: +if is_release: # '2_62a_release' BLENDER_VERSION_PATH = "%s%s_release" % ("_".join(blender_version_strings[:2]), bpy.app.version_char) +else: + # '2_62_1' + BLENDER_VERSION_PATH = "_".join(blender_version_strings) # --------------------------DOWNLOADABLE FILES---------------------------------- |