[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35942] trunk/blender: modification to api docs so release point to:

[Campbell Barton]

Revision: 35942
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35942
Author:   campbellbarton
Date:     2011-04-01 15:13:58 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
modification to api docs so release point to:
  http://www.blender.org/documentation/blender_python_api_2_57b_release

Development versions point to:
   http://www.blender.org/documentation/blender_python_api_2_57_0

This way updates to api docs after release wont overwrite release docs.

Modified Paths:
--------------
    trunk/blender/doc/python_api/sphinx_doc_gen.sh
    trunk/blender/release/scripts/startup/bl_operators/wm.py
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/python/intern/bpy_app.c

Modified: trunk/blender/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.sh	2011-04-01 15:08:45 UTC (rev 35941)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.sh	2011-04-01 15:13:58 UTC (rev 35942)
@@ -12,10 +12,18 @@
 # "_".join(str(v) for v in bpy.app.version)
 # custom blender vars
 blender_srcdir=$(dirname $0)/../../
-blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion
+blender_version=$(grep "BLENDER_VERSION\s" $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
+blender_version_char=$(grep BLENDER_VERSION_CHAR $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
+blender_version_cycle=$(grep BLENDER_VERSION_CYCLE $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
+blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | awk '{print $3}')
 
+if [ "$blender_version_cycle" == "release" ]
+then
+	BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)$blender_version_char"_release"
+else
+	BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion
+fi
+
 SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
 
 SPHINXBASE=doc/python_api/

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-04-01 15:08:45 UTC (rev 35941)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-04-01 15:13:58 UTC (rev 35942)
@@ -596,7 +596,10 @@
     bl_label = "View Documentation"
 
     doc_id = doc_id
-    _prefix = "http://www.blender.org/documentation/blender_python_api_%s" % "_".join(str(v) for v in bpy.app.version)
+    if bpy.app.version_cycle == "release":
+        _prefix = "http://www.blender.org/documentation/blender_python_api_%s%s_release" % ("_".join(str(v) for v in bpy.app.version[:2]), bpy.app.version_char)
+    else:
+        _prefix = "http://www.blender.org/documentation/blender_python_api_%s" % "_".join(str(v) for v in bpy.app.version)
 
     def _nested_class_string(self, class_string):
         ls = []

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2011-04-01 15:08:45 UTC (rev 35941)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2011-04-01 15:13:58 UTC (rev 35942)
@@ -52,7 +52,7 @@
 /* used by packaging tools */
 		/* can be left blank, otherwise a,b,c... etc with no quotes */
 #define BLENDER_VERSION_CHAR	a
-		/* alpha/beta/rc/releases */
+		/* alpha/beta/rc/release, docs use this */
 #define BLENDER_VERSION_CYCLE	rc
 
 struct ListBase;

Modified: trunk/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app.c	2011-04-01 15:08:45 UTC (rev 35941)
+++ trunk/blender/source/blender/python/intern/bpy_app.c	2011-04-01 15:13:58 UTC (rev 35942)
@@ -59,7 +59,8 @@
 static PyStructSequence_Field app_info_fields[]= {
 	{(char *)"version", (char *)"The Blender version as a tuple of 3 numbers. eg. (2, 50, 11)"},
 	{(char *)"version_string", (char *)"The Blender version formatted as a string"},
-	{(char *)"release", (char *)"The release status of this build alpha/beta/rc/stable"},
+	{(char *)"version_char", (char *)"The Blender version character (for minor releases)"},
+	{(char *)"version_cycle", (char *)"The release status of this build alpha/beta/rc/release"},
 	{(char *)"binary_path", (char *)"The location of blenders executable, useful for utilities that spawn new instances"},
 	{(char *)"background", (char *)"Boolean, True when blender is running without a user interface (started with -b)"},
 
@@ -104,6 +105,7 @@
 
 	SetObjItem(Py_BuildValue("(iii)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
 	SetObjItem(PyUnicode_FromFormat("%d.%02d (sub %d)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
+	SetStrItem(STRINGIFY(BLENDER_VERSION_CHAR));
 	SetStrItem(STRINGIFY(BLENDER_VERSION_CYCLE));
 	SetStrItem(bprogname);
 	SetObjItem(PyBool_FromLong(G.background));