Python API Docs: update for using git buildinfo and change upload URL
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Nov 2013 23:00:57 +0000 (10:00 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Nov 2013 23:00:57 +0000 (10:00 +1100)
doc/python_api/sphinx_doc_gen.py
doc/python_api/sphinx_doc_gen.sh

index e95fa6fef3569f952d0679748114db13421908dd..ff3fe6377c2ef7e9284c0859c1ee2f13864ffbdc 100644 (file)
@@ -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":
index 9e069cb0540c24183562aebf3aedcf31ed547147..5b9af77a58c814d86e736789dffda9bbbbd26048 100755 (executable)
@@ -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@emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
+       ssh $SSH_USER@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@emo.blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
+       #ssh $SSH_USER@blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
 
        # better redirect
-       ssh $SSH_USER@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@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@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@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