[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36502] trunk/blender: sphinx api docs: fix for addons linking to the wrong operator SVN url's.

Campbell Barton ideasman42 at gmail.com
Thu May 5 16:45:24 CEST 2011


Revision: 36502
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36502
Author:   campbellbarton
Date:     2011-05-05 14:45:24 +0000 (Thu, 05 May 2011)
Log Message:
-----------
sphinx api docs: fix for addons linking to the wrong operator SVN url's.
also change from blender from 'release' back to beta so new docs don't overwrite the 2.57b release docs.

Modified Paths:
--------------
    trunk/blender/doc/python_api/sphinx_doc_gen.py
    trunk/blender/source/blender/blenkernel/BKE_blender.h

Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py	2011-05-05 14:21:31 UTC (rev 36501)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py	2011-05-05 14:45:24 UTC (rev 36502)
@@ -810,7 +810,9 @@
 
     # operators
     def write_ops():
-        API_BASEURL = "https://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts"
+        API_BASEURL = "http://svn.blender.org/svnroot/bf-blender/trunk/blender/release/scripts"
+        API_BASEURL_ADDON = "http://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts"
+        API_BASEURL_ADDON_CONTRIB = "http://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts"
 
         op_modules = {}
         for op in ops.values():
@@ -849,8 +851,15 @@
 
                 location = op.get_location()
                 if location != (None, None):
-                    fw("   :file: `%s <%s/%s>`_:%d\n\n" % (location[0], API_BASEURL, location[0], location[1]))
+                    if location[0].startswith("addons_contrib" + os.sep):
+                        url_base = API_BASEURL_ADDON_CONTRIB
+                    elif location[0].startswith("addons" + os.sep):
+                        url_base = API_BASEURL_ADDON
+                    else:
+                        url_base = API_BASEURL
 
+                    fw("   :file: `%s <%s/%s>`_:%d\n\n" % (location[0], url_base, location[0], location[1]))
+
             file.close()
 
     if "bpy.ops" not in EXCLUDE_MODULES:

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2011-05-05 14:21:31 UTC (rev 36501)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2011-05-05 14:45:24 UTC (rev 36502)
@@ -53,7 +53,7 @@
 		/* can be left blank, otherwise a,b,c... etc with no quotes */
 #define BLENDER_VERSION_CHAR	b
 		/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE	release
+#define BLENDER_VERSION_CYCLE	beta
 
 struct ListBase;
 struct MemFile;




More information about the Bf-blender-cvs mailing list