merged

6a5a3431 · Davis King · 9d6386ad · 3bcfddc0 · 6a5a3431 · 6a5a3431
Commit 6a5a3431 authored Aug 15, 2013 by Davis King
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

.hgtags .hgtags +1 -0

.current_minor_release_number docs/.current_minor_release_number +1 -1

.logger_revnum docs/.logger_revnum +1 -1

makedocs docs/makedocs +6 -0

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ df60c7686f3982791e218977edb64d638151ca3b v18.0
 8d0762ab49b9ee8d1d3fc1fc02926c6bde6d5542 v18.1
 5de237bc41c1c2e63d0731731eee231a4213a31b v18.2
 7f21bd92812d2d08fe9a881a401cbf0f6b104081 v18.3
+78be73b57b829adb20a452ad910f7039a09c9474 v18.4
--- a/docs/.current_minor_release_number
+++ b/docs/.current_minor_release_number
-3
+4
--- a/docs/.logger_revnum
+++ b/docs/.logger_revnum
-7f21bd92812d
+78be73b57b82
--- a/docs/makedocs
+++ b/docs/makedocs
@@ -137,8 +137,14 @@ makedocs ()
    # the python docs can't be created (this happens if the .so file isn't compiled)
    if [ "$1" = "makerel" ] 
    then
+        pushd ../python_examples
+        ./compile_dlib_python_module.bat || report_failure
+        popd
        sphinx-build -b html docs/python sphinx.$$ || report_failure
    else
+        pushd ../python_examples
+        ./compile_dlib_python_module.bat 
+        popd
        sphinx-build -b html docs/python sphinx.$$
    fi;