use old build/doc directory for html output

doc/CMakeLists.txt

@@ -1,6 +1,8 @@
 find_package(Sphinx REQUIRED)
 
-file(COPY ${PROJECT_SOURCE_DIR}/doc DESTINATION ${PROJECT_BINARY_DIR})
+make_directory(${PROJECT_BINARY_DIR}/doc_src)
+file(GLOB DOC_SRC "${PROJECT_SOURCE_DIR}/doc/*")
+file(COPY ${DOC_SRC} DESTINATION ${PROJECT_BINARY_DIR}/doc_src)
 
 function(generate_rst in out)
   add_custom_command(OUTPUT ${out}
@@ -9,15 +11,15 @@ function(generate_rst in out)
                      COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in} ${out})
 endfunction()
 
-generate_rst(${PROJECT_SOURCE_DIR}/include/ua_types.h ${PROJECT_BINARY_DIR}/doc/types.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/ua_types.h ${PROJECT_BINARY_DIR}/doc_src/types.rst)
 
 add_custom_target(doc_latex ${SPHINX_EXECUTABLE}
-  -b latex -c "${PROJECT_BINARY_DIR}/doc" "${PROJECT_BINARY_DIR}/doc" "${PROJECT_BINARY_DIR}/doc_latex"
-  DEPENDS ${PROJECT_BINARY_DIR}/doc/types.rst
+  -b latex -c "${PROJECT_BINARY_DIR}/doc_src" "${PROJECT_BINARY_DIR}/doc_src" "${PROJECT_BINARY_DIR}/doc_latex"
+  DEPENDS ${PROJECT_BINARY_DIR}/doc_src/types.rst
   COMMENT "Building LaTeX sources for documentation with Sphinx")
 add_custom_target(doc ${SPHINX_EXECUTABLE}
-  -b html -c "${PROJECT_BINARY_DIR}/doc" "${PROJECT_BINARY_DIR}/doc" "${PROJECT_BINARY_DIR}/doc_html"
-  COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_BINARY_DIR}/doc/open62541_html.png" "${PROJECT_BINARY_DIR}/doc_html/_static/"
-  DEPENDS ${PROJECT_BINARY_DIR}/doc/types.rst
+  -b html -c "${PROJECT_BINARY_DIR}/doc_src" "${PROJECT_BINARY_DIR}/doc_src" "${PROJECT_BINARY_DIR}/doc"
+  COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_BINARY_DIR}/doc_src/open62541_html.png" "${PROJECT_BINARY_DIR}/doc/_static/"
+  DEPENDS ${PROJECT_BINARY_DIR}/doc_src/types.rst
   COMMENT "Building HTML documentation with Sphinx")
 

tools/travis_osx_script.sh

@@ -38,4 +38,4 @@ else
 	(valgrind --error-exitcode=3 ./server & export pid=$!; sleep 2; kill -INT $pid; wait $pid);
 	cd .. && rm -rf build
 
-fi
+fi

tools/travis_push_doc.sh

@@ -4,7 +4,7 @@ git clone --depth=5 -b gh-pages https://$GITAUTH@github.com/open62541/open62541-
 cd open62541-www
 
 git rm -r -f ./doc/current/*
-cp -r ../../doc_html/* ./doc/current/
+cp -r ../../doc/* ./doc/current/
 git add -A ./doc/current
 git config --global user.email "open62541-travis-ci@users.noreply.github.com"
 git config --global user.name "Open62541 travis-ci"