Move doctrees out of build directory

And remove level of nesting. Doctrees can be shared between different
builders, so it's not necessary to place them in target-specific
directories.

This means that the structure of BookHTML/ matches what is in
gh-pages.

Author: nikic

.gitignore

@@ -1,2 +1,3 @@
+doctrees/
 BookHTML/
-BookLatex/
+BookLatex/

build_html.sh

@@ -1 +1 @@
-sphinx-build -b html -d BookHTML/doctrees Book BookHTML/html
+sphinx-build -b html -d doctrees Book BookHTML

build_release_html.sh

@@ -1,7 +1,7 @@
 # get rid of old files, so we don't keep them around in the git repo
 # when a file or directory was renamed
-rm -rf BookHTML/html/*/
-rm -f BookHTML/html/*.html
-rm -f BookHTML/html/.buildinfo
+rm -rf BookHTML/*/
+rm -f BookHTML/*.html
+rm -f BookHTML/.buildinfo
 
-sphinx-build -b html -d BookHTML/doctrees -a Book BookHTML/html
+sphinx-build -b html -d doctrees -a Book BookHTML

build_release_latex.sh

@@ -2,8 +2,8 @@ rm -rf BookLatex
 # inkscape Book/hashtables/images/basic_hashtable.svg -D -A Book/hashtables/images/basic_hashtable.pdf
 # inkscape Book/hashtables/images/doubly_linked_hashtable.svg -D -A Book/hashtables/images/doubly_linked_hashtable.pdf
 # inkscape Book/hashtables/images/ordered_hashtable.svg -D -A Book/hashtables/images/ordered_hashtable.pdf
-sphinx-build -b latex -d BookLatex/doctrees -a Book BookLatex/latex
-cd BookLatex/latex
+sphinx-build -b latex -d doctrees -a Book BookLatex
+cd BookLatex
 pdflatex PHPInternalsBook.tex
 pdflatex PHPInternalsBook.tex
-cd ../..
+cd ..