[Bf-blender-cvs] [f85cced] master: Python API Docs: update for using git buildinfo and change upload URL

Campbell Barton noreply at git.blender.org
Fri Nov 29 00:02:24 CET 2013


Commit: f85ccedb93ec35b7edc3ab64dd0470f9dedd7a55
Author: Campbell Barton
Date:   Fri Nov 29 10:00:57 2013 +1100
http://developer.blender.org/rBf85ccedb93ec35b7edc3ab64dd0470f9dedd7a55

Python API Docs: update for using git buildinfo and change upload URL

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

M	doc/python_api/sphinx_doc_gen.py
M	doc/python_api/sphinx_doc_gen.sh

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

diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index e95fa6f..ff3fe63 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -384,12 +384,12 @@ MODULE_GROUPING = {
 blender_version_strings = [str(v) for v in bpy.app.version]
 
 # converting bytes to strings, due to #30154
-BLENDER_REVISION = str(bpy.app.build_revision, 'utf_8')
+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 BLENDER_REVISION != "Unknown":
-    BLENDER_VERSION_DOTS += " r" + BLENDER_REVISION         # '2.62.1 r44584'
+    BLENDER_VERSION_DOTS += " " + BLENDER_REVISION          # '2.62.1 SHA1'
 
 BLENDER_VERSION_PATH = "_".join(blender_version_strings)    # '2_62_1'
 if bpy.app.version_cycle == "release":
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh
index 9e069cb..5b9af77 100755
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
@@ -17,7 +17,7 @@ DO_OUT_PDF=false
 
 BLENDER="./blender.bin"
 SSH_USER="ideasman42"
-SSH_HOST=$SSH_USER"@emo.blender.org"
+SSH_HOST=$SSH_USER"@blender.org"
 SSH_UPLOAD="/data/www/vhosts/www.blender.org/documentation" # blender_python_api_VERSION, added after
 
 # ----------------------------------------------------------------------------
@@ -99,18 +99,18 @@ fi
 if $DO_UPLOAD ; then
 
 	cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html
-	ssh $SSH_USER at emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
+	ssh $SSH_USER at 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'
+	#ssh $SSH_USER at blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
 
 	# better redirect
-	ssh $SSH_USER at emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html'
+	ssh $SSH_USER at blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html'
 
 	# redirect for release only so wiki can point here
 	if [ "$blender_version_cycle" == "release" ] ; then
-		ssh $SSH_USER at emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html'
+		ssh $SSH_USER at blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/blender_python_api/index.html'
 	fi
 
 	if $DO_OUT_PDF ; then




More information about the Bf-blender-cvs mailing list