[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34668] trunk/blender: - cmake was missing an inclide (IDE's wouldnt index)
Campbell Barton
ideasman42 at gmail.com
Sun Feb 6 11:18:22 CET 2011
Revision: 34668
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34668
Author: campbellbarton
Date: 2011-02-06 10:18:20 +0000 (Sun, 06 Feb 2011)
Log Message:
-----------
- cmake was missing an inclide (IDE's wouldnt index)
- made doc generation always sumlink newly built docs to static URL. http://www.blender.org/documentation/250PythonDoc/
Modified Paths:
--------------
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/doc/python_api/sphinx_doc_gen.sh
trunk/blender/source/blender/python/generic/mathutils_euler.c
trunk/blender/source/blender/python/generic/mathutils_matrix.c
trunk/blender/source/blender/render/CMakeLists.txt
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-02-06 09:01:01 UTC (rev 34667)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-02-06 10:18:20 UTC (rev 34668)
@@ -328,7 +328,7 @@
file = open(filepath, "w")
fw = file.write
- version_string = bpy.app.version_string.split("(")[0]
+ version_string = ".".join(str(v) for v in bpy.app.version)
if bpy.app.build_revision != "Unknown":
version_string = version_string + " r" + bpy.app.build_revision
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.sh 2011-02-06 09:01:01 UTC (rev 34667)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.sh 2011-02-06 10:18:20 UTC (rev 34668)
@@ -4,10 +4,11 @@
# ssh upload means you need an account on the server
BLENDER="./blender.bin"
-SSH_HOST="ideasman42 at emo.blender.org"
+SSH_USER="ideasman42"
+SSH_HOST=$SSH_USER"@emo.blender.org"
SSH_UPLOAD="/data/www/vhosts/www.blender.org/documentation" # blender_python_api_VERSION, added after
-# sed string from hell, 'Blender 2.53 (sub 1) Build' --> '2_53_1'
+# 'Blender 2.53 (sub 1) Build' --> '2_53_1' as a shell script.
# "_".join(str(v) for v in bpy.app.version)
# custom blender vars
blender_srcdir=$(dirname $0)/../../
@@ -25,12 +26,18 @@
# html
sphinx-build $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html
-ssh ideasman42 at emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
+ssh $SSH_USER at emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
+# symlink the dir to a static URL
+ssh $SSH_USER at emo.blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
+
# pdf
sphinx-build -b latex $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
cd $SPHINXBASE/sphinx-out
make
cd -
-rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/contents.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
+
+# rename so local PDF has matching name.
+mv $SPHINXBASE/sphinx-out/contents.pdf $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
+rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
Modified: trunk/blender/source/blender/python/generic/mathutils_euler.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_euler.c 2011-02-06 09:01:01 UTC (rev 34667)
+++ trunk/blender/source/blender/python/generic/mathutils_euler.c 2011-02-06 10:18:20 UTC (rev 34668)
@@ -122,7 +122,7 @@
//return a quaternion representation of the euler
static char Euler_to_quaternion_doc[] =
-".. method:: to_quat()\n"
+".. method:: to_quaternion()\n"
"\n"
" Return a quaternion representation of the euler.\n"
"\n"
Modified: trunk/blender/source/blender/python/generic/mathutils_matrix.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-02-06 09:01:01 UTC (rev 34667)
+++ trunk/blender/source/blender/python/generic/mathutils_matrix.c 2011-02-06 10:18:20 UTC (rev 34668)
@@ -635,7 +635,7 @@
/*-----------------------------METHODS----------------------------*/
static char Matrix_to_quaternion_doc[] =
-".. method:: to_quat()\n"
+".. method:: to_quaternion()\n"
"\n"
" Return a quaternion representation of the rotation matrix.\n"
"\n"
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt 2011-02-06 09:01:01 UTC (rev 34667)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2011-02-06 10:18:20 UTC (rev 34668)
@@ -107,6 +107,7 @@
intern/include/zbuf.h
intern/raytrace/bvh.h
intern/raytrace/rayobject_hint.h
+ intern/raytrace/rayobject_internal.h
intern/raytrace/rayobject_rtbuild.h
intern/raytrace/reorganize.h
intern/raytrace/svbvh.h
More information about the Bf-blender-cvs
mailing list