Removed Sphinx generation commands from cmake scripts

CMakeLists.txt

@@ -473,14 +473,10 @@ include(cmake/OpenCVFindLibsPerf.cmake)
 #  Detect other 3rd-party libraries/tools
 # ----------------------------------------------------------------------------
 
-# --- LATEX for pdf documentation ---
-unset(HAVE_DOXYGEN CACHE)
+# --- Doxygen for documentation ---
+unset(DOXYGEN_FOUND CACHE)
 if(BUILD_DOCS)
-  include(cmake/OpenCVFindLATEX.cmake)
-  find_host_program(DOXYGEN_BUILD doxygen)
-  if (DOXYGEN_BUILD)
-    set(HAVE_DOXYGEN 1)
-  endif (DOXYGEN_BUILD)
+  find_package(Doxygen)
 endif(BUILD_DOCS)
 
 # --- Python Support ---
@@ -1083,15 +1079,7 @@ endif()
 if(BUILD_DOCS)
   status("")
   status("  Documentation:")
-  if(HAVE_SPHINX)
-    status("    Build Documentation:" PDFLATEX_COMPILER      THEN YES ELSE "YES (only HTML and without math expressions)")
-  else()
-    status("    Build Documentation:" NO)
-  endif()
-  status("    Sphinx:"              HAVE_SPHINX              THEN "${SPHINX_BUILD} (ver ${SPHINX_VERSION})" ELSE NO)
-  status("    PdfLaTeX compiler:"   PDFLATEX_COMPILER        THEN "${PDFLATEX_COMPILER}" ELSE NO)
-  status("    PlantUML:"            PLANTUML                 THEN "${PLANTUML}" ELSE NO)
-  status("    Doxygen:"             HAVE_DOXYGEN             THEN "YES (${DOXYGEN_BUILD})" ELSE NO)
+  status("    Doxygen:"             DOXYGEN_FOUND             THEN "${DOXYGEN_EXECUTABLE} (ver ${DOXYGEN_VERSION})" ELSE NO)
 endif()
 
 # ========================== samples and tests ==========================

cmake/OpenCVDetectPython.cmake

@@ -237,21 +237,3 @@ if(PYTHON2INTERP_FOUND)
     set(PYTHON_DEFAULT_AVAILABLE "TRUE")
     set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON2_EXECUTABLE}")
 endif()
-
-unset(HAVE_SPHINX CACHE)
-
-if(BUILD_DOCS)
-  find_host_program(SPHINX_BUILD sphinx-build)
-  find_host_program(PLANTUML plantuml)
-  if(SPHINX_BUILD)
-      execute_process(COMMAND "${SPHINX_BUILD}"
-                      OUTPUT_QUIET
-                      ERROR_VARIABLE SPHINX_OUTPUT
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-      if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
-        set(SPHINX_VERSION "${CMAKE_MATCH_1}")
-        set(HAVE_SPHINX 1)
-        message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
-      endif()
-  endif()
-endif(BUILD_DOCS)

doc/CMakeLists.txt

@@ -2,7 +2,7 @@
 #  CMake file for OpenCV docs
 #-----------------------
 
-set(HAVE_DOC_GENERATOR BUILD_DOCS AND (HAVE_SPHINX OR HAVE_DOXYGEN))
+set(HAVE_DOC_GENERATOR BUILD_DOCS AND DOXYGEN_FOUND)
 
 if(HAVE_DOC_GENERATOR)
   project(opencv_docs)
@@ -34,120 +34,9 @@ if(HAVE_DOC_GENERATOR)
   set(OPTIONAL_DOC_LIST "")
 endif(HAVE_DOC_GENERATOR)
 
-# ========= Sphinx docs =========
-if(BUILD_DOCS AND HAVE_SPHINX)
-  if(NOT INSTALL_CREATE_DISTRIB)
-    list(APPEND DOC_LIST "${OpenCV_SOURCE_DIR}/doc/haartraining.htm")
-  endif()
-
-  # build lists of documentation files and generate table of contents for reference manual
-  set(DOC_FAKE_ROOT "${CMAKE_CURRENT_BINARY_DIR}/fake-root")
-  set(DOC_FAKE_ROOT_FILES "")
-
-  function(ocv_doc_add_file_to_fake_root source destination)
-    add_custom_command(
-      OUTPUT "${DOC_FAKE_ROOT}/${destination}"
-      COMMAND "${CMAKE_COMMAND}" -E copy "${source}" "${DOC_FAKE_ROOT}/${destination}"
-      DEPENDS "${source}"
-      COMMENT "Copying ${destination} to fake root..."
-      VERBATIM
-    )
-    list(APPEND DOC_FAKE_ROOT_FILES "${DOC_FAKE_ROOT}/${destination}")
-    set(DOC_FAKE_ROOT_FILES "${DOC_FAKE_ROOT_FILES}" PARENT_SCOPE)
-  endfunction()
-
-  function(ocv_doc_add_to_fake_root source)
-    if(ARGC GREATER 1)
-      set(destination "${ARGV1}")
-    else()
-      file(RELATIVE_PATH destination "${OpenCV_SOURCE_DIR}" "${source}")
-    endif()
-
-    if(IS_DIRECTORY "${source}")
-      file(GLOB_RECURSE files RELATIVE "${source}" "${source}/*")
-
-      foreach(file ${files})
-        ocv_doc_add_file_to_fake_root("${source}/${file}" "${destination}/${file}")
-      endforeach()
-    else()
-      ocv_doc_add_file_to_fake_root("${source}" "${destination}")
-    endif()
-
-    set(DOC_FAKE_ROOT_FILES "${DOC_FAKE_ROOT_FILES}" PARENT_SCOPE)
-  endfunction()
-
-  set(OPENCV_REFMAN_TOC "")
-
-  foreach(mod ${BASE_MODULES} ${EXTRA_MODULES})
-    if(EXISTS "${OPENCV_MODULE_opencv_${mod}_LOCATION}/doc/${mod}.rst")
-      ocv_doc_add_to_fake_root("${OPENCV_MODULE_opencv_${mod}_LOCATION}/doc" modules/${mod}/doc)
-      set(OPENCV_REFMAN_TOC "${OPENCV_REFMAN_TOC}   ${mod}/doc/${mod}.rst\n")
-    endif()
-  endforeach()
-
-  configure_file("${OpenCV_SOURCE_DIR}/modules/refman.rst.in" "${DOC_FAKE_ROOT}/modules/refman.rst" @ONLY)
-
-  ocv_doc_add_to_fake_root("${OpenCV_SOURCE_DIR}/index.rst")
-  ocv_doc_add_to_fake_root("${OpenCV_SOURCE_DIR}/doc")
-  ocv_doc_add_to_fake_root("${OpenCV_SOURCE_DIR}/platforms/android")
-  ocv_doc_add_to_fake_root("${OpenCV_SOURCE_DIR}/samples")
-
-  set(BUILD_PLANTUML "")
-  if(PLANTUML)
-    set(BUILD_PLANTUML "-tplantuml")
-  endif()
-
-  if(PDFLATEX_COMPILER)
-    add_custom_target(docs
-      COMMAND ${SPHINX_BUILD} ${BUILD_PLANTUML} -b latex -c "${CMAKE_CURRENT_SOURCE_DIR}" "${DOC_FAKE_ROOT}" .
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty ${CMAKE_CURRENT_BINARY_DIR}
-      COMMAND ${PYTHON_DEFAULT_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2refman.tex
-      COMMAND ${PYTHON_DEFAULT_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2manager.tex
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv2refman.pdf"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2refman.tex
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2refman.tex
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv2manager.pdf"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2manager.tex
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv2manager.tex
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_user.pdf"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_user.tex
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_user.tex
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_tutorials.pdf"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_tutorials.tex
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode opencv_tutorials.tex
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating opencv_cheatsheet.pdf"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode "${CMAKE_CURRENT_SOURCE_DIR}/opencv_cheatsheet.tex"
-      COMMAND ${PDFLATEX_COMPILER} -interaction=batchmode "${CMAKE_CURRENT_SOURCE_DIR}/opencv_cheatsheet.tex"
-      DEPENDS ${DOC_FAKE_ROOT_FILES}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      COMMENT "Generating the PDF Manuals"
-      )
-
-    LIST(APPEND OPTIONAL_DOC_LIST "${CMAKE_BINARY_DIR}/doc/opencv2refman.pdf" "${CMAKE_BINARY_DIR}/doc/opencv2manager.pdf"
-          "${CMAKE_BINARY_DIR}/doc/opencv_user.pdf" "${CMAKE_BINARY_DIR}/doc/opencv_tutorials.pdf" "${CMAKE_BINARY_DIR}/doc/opencv_cheatsheet.pdf")
-
-    if(ENABLE_SOLUTION_FOLDERS)
-      set_target_properties(docs PROPERTIES FOLDER "documentation")
-    endif()
-  endif()
-
-  add_custom_target(html_docs
-    COMMAND "${SPHINX_BUILD}" ${BUILD_PLANTUML} -b html -c "${CMAKE_CURRENT_SOURCE_DIR}" "${DOC_FAKE_ROOT}" ./_html
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${DOC_FAKE_ROOT_FILES}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Generating Online Documentation"
-    )
-
-  if(ENABLE_SOLUTION_FOLDERS)
-    set_target_properties(html_docs PROPERTIES FOLDER "documentation")
-  endif()
-
-endif()
-
 # ========= Doxygen docs =========
 
-if(BUILD_DOCS AND HAVE_DOXYGEN)
+if(BUILD_DOCS AND DOXYGEN_FOUND)
   # not documented modules list
   list(APPEND blacklist "ts" "java" "python2" "python3" "world")
 
@@ -252,7 +141,7 @@ if(BUILD_DOCS AND HAVE_DOXYGEN)
     COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/samples" "${CMAKE_DOXYGEN_OUTPUT_PATH}/html/samples"
     COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/pattern.png" "${CMAKE_DOXYGEN_OUTPUT_PATH}/html"
     COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/acircles_pattern.png" "${CMAKE_DOXYGEN_OUTPUT_PATH}/html"
-    COMMAND ${DOXYGEN_BUILD} ${doxyfile}
+    COMMAND ${DOXYGEN_EXECUTABLE} ${doxyfile}
     DEPENDS ${doxyfile} ${rootfile} ${bibfile} ${deps}
   )
 endif()

modules/java/CMakeLists.txt

@@ -32,8 +32,6 @@ endforeach()
 # scripts
 set(scripts_gen_java "${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_java.py")
 set(scripts_hdr_parser "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py")
-set(scripts_gen_javadoc "${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_javadoc.py")
-set(scripts_rst_parser "${CMAKE_CURRENT_SOURCE_DIR}/generator/rst_parser.py")
 
 # handwritten C/C++ and Java sources
 file(GLOB handwrittren_h_sources "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp/*.hpp")
@@ -75,13 +73,6 @@ foreach(module ${OPENCV_JAVA_MODULES})
   endif()
 endforeach()
 
-# rst documentation used for javadoc generation
-set(javadoc_rst_sources "")
-foreach(module ${OPENCV_JAVA_MODULES})
-  file(GLOB_RECURSE refman_rst_headers "${OPENCV_MODULE_opencv_${module}_LOCATION}/*.rst")
-  list(APPEND javadoc_rst_sources ${refman_rst_headers})
-endforeach()
-
 # generated cpp files
 set(generated_cpp_sources "")
 foreach(module ${OPENCV_JAVA_MODULES})
@@ -112,13 +103,6 @@ foreach(module ${OPENCV_JAVA_MODULES})
   list(APPEND generated_java_sources ${generated_java_sources_${module}})
 endforeach()
 
-# generated java files with javadoc
-set(documented_java_files "")
-foreach(java_file ${generated_java_sources} ${handwrittren_java_sources})
-  get_filename_component(java_file_name "${java_file}" NAME_WE)
-  list(APPEND documented_java_files "${CMAKE_CURRENT_BINARY_DIR}/${java_file_name}-jdoc.java")
-endforeach()
-
 ######################################################################################################################################
 
 # step 1: generate .cpp/.java from OpenCV headers
@@ -132,18 +116,8 @@ foreach(module ${OPENCV_JAVA_MODULES})
                     )
 endforeach()
 
-# step 2: generate javadoc comments
-set(step2_depends ${step1_depends} ${scripts_gen_javadoc} ${scripts_rst_parser} ${javadoc_rst_sources} ${generated_java_sources} ${handwrittren_java_sources})
-string(REPLACE ";" "," OPENCV_JAVA_MODULES_STR "${OPENCV_JAVA_MODULES}")
-add_custom_command(OUTPUT ${documented_java_files}
-                   COMMAND ${PYTHON_DEFUALT_EXECUTABLE} "${scripts_gen_javadoc}" --modules ${OPENCV_JAVA_MODULES_STR} "${CMAKE_CURRENT_SOURCE_DIR}/generator/src/java" "${CMAKE_CURRENT_BINARY_DIR}" 2> "${CMAKE_CURRENT_BINARY_DIR}/get_javadoc_errors.log"
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   DEPENDS ${step2_depends}
-                   VERBATIM
-                  )
-
 # step 3: copy files to destination
-set(step3_input_files ${documented_java_files} ${handwrittren_aidl_sources})
+set(step3_input_files ${generated_java_sources} ${handwrittren_java_sources} ${handwrittren_aidl_sources})
 set(copied_files "")
 foreach(java_file ${step3_input_files})
   get_filename_component(java_file_name "${java_file}" NAME)
@@ -154,7 +128,7 @@ foreach(java_file ${step3_input_files})
   add_custom_command(OUTPUT "${output_name}"
                      COMMAND ${CMAKE_COMMAND} -E copy "${java_file}" "${output_name}"
                      MAIN_DEPENDENCY "${java_file}"
-                     DEPENDS ${step2_depends}
+                     DEPENDS ${step1_depends} ${generated_java_sources} ${handwrittren_java_sources}
                      COMMENT "Generating src/org/opencv/${java_file_name}"
                     )
   list(APPEND copied_files "${output_name}")