Revision: 44018
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44018
Author:   campbellbarton
Date:     2012-02-10 15:00:55 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Disable PDF doc since its giving errors with latex indentation.

upload the zipped version of HTML docs instead.

Modified Paths:
--------------
    trunk/blender/doc/python_api/sphinx_doc_gen.py
    trunk/blender/doc/python_api/sphinx_doc_gen.sh

Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py      2012-02-10 08:09:49 UTC 
(rev 44017)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py      2012-02-10 15:00:55 UTC 
(rev 44018)
@@ -1135,8 +1135,10 @@
     fw("\n")
     fw("Welcome, this document is an API reference for Blender %s. built 
%s.\n" % (version_string, bpy.app.build_date))
     fw("\n")
-    fw("`A PDF version of this document is also available 
<blender_python_reference_%s.pdf>`_\n" % version_string_pdf)
 
+    # fw("`A PDF version of this document is also available 
<blender_python_reference_%s.pdf>`_\n" % version_string_pdf)
+    fw("`A compressed ZIP file of this site is available 
<blender_python_reference_%s.zip>`_\n" % version_string_pdf)
+
     fw("\n")
 
     if not EXCLUDE_INFO_DOCS:

Modified: trunk/blender/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.sh      2012-02-10 08:09:49 UTC 
(rev 44017)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.sh      2012-02-10 15:00:55 UTC 
(rev 44018)
@@ -11,7 +11,8 @@
 DO_UPLOAD=true
 DO_EXE_BLENDER=true
 DO_OUT_HTML=true
-DO_OUT_PDF=true
+DO_OUT_HTML_ZIP=true
+DO_OUT_PDF=false
 
 
 BLENDER="./blender.bin"
@@ -61,6 +62,17 @@
        # annoying bug in sphinx makes it very slow unless we do this. should 
report.
        cd $SPHINXBASE
        sphinx-build -n -b html sphinx-in sphinx-out
+
+       # 
------------------------------------------------------------------------
+       # ZIP the HTML dir for upload
+
+       if $DO_OUT_HTML_ZIP ; then
+               # lame, temp rename dir
+               mv sphinx-out blender_python_reference_$BLENDER_VERSION
+               zip -r -9 blender_python_reference_$BLENDER_VERSION.zip 
blender_python_reference_$BLENDER_VERSION
+               mv blender_python_reference_$BLENDER_VERSION sphinx-out
+       fi
+
        cd -
 fi
 
@@ -74,6 +86,7 @@
        mv $SPHINXBASE/sphinx-out/contents.pdf 
$SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
 fi
 
+
 # ----------------------------------------------------------------------------
 # Upload to blender servers, comment this section for testing
 
@@ -89,9 +102,15 @@
        # better redirect
        ssh [email protected] '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'
 
-       # rename so local PDF has matching name.
-       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
+       if $DO_OUT_PDF ; then
+               # rename so local PDF has matching name.
+               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
+       fi
 
+       if $DO_OUT_HTML_ZIP ; then
+               rsync --progress -avze "ssh -p 22" 
$SPHINXBASE/blender_python_reference_$BLENDER_VERSION.zip 
$SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
+       fi
+
 fi
 
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to