[patch] patch for proper documentation generating without bundled tools

opencolorio-documentation-gen.patch (text/plain), 4.37 KB, created by Sergey Popov on 2012-08-18 13:39:50 UTC

--- docs/CMakeLists.txt.orig	2012-08-18 17:21:23.833556790 +0400
+++ docs/CMakeLists.txt	2012-08-18 17:22:44.968559366 +0400
@@ -1,62 +1,3 @@
-
-###############################################################################
-### External Doc Apps ###
-
-# setuptools
-set(SETUPTOOLS_VERSION 0.6c11)
-ExternalProject_Add(setuptools
-    URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# docutils
-set(DOCUTILS_VERSION 0.7)
-ExternalProject_Add(docutils
-    DEPENDS setuptools
-    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# jinja2
-set(JINJA2_VERSION 2.5.5)
-ExternalProject_Add(Jinja2
-    DEPENDS setuptools
-    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# Pygments
-set(PYGMENTS_VERSION 1.3.1)
-ExternalProject_Add(Pygments
-    DEPENDS setuptools
-    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# sphinx
-set(SPHINX_VERSION f52b631f501a) # 1.1pre
-ExternalProject_Add(Sphinx
-    DEPENDS setuptools docutils Jinja2 Pygments
-    URL ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.tar.gz
-    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
-)
-
 ###############################################################################
 ### Create Doc Targets ###
 
@@ -81,7 +22,7 @@
 ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
 
 add_custom_target(doc ALL
-    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
     DEPENDS
         OpenColorIO
         PyOpenColorIO
@@ -93,19 +34,15 @@
     COMMENT "Building html docs"
     SOURCES ${DOCFILES})
 
-# note: ExternalProject will not build when added to a add_custom_target this
-# works around this problem. This seems to be fixed in the cmake ^HEAD
-add_dependencies(doc Sphinx) 
-
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
         PATTERN .git EXCLUDE)
 
 find_package(LATEX)
 if(PDFLATEX_COMPILER)
     
     add_custom_target(latex
-        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+        COMMAND PYTHONPATH=sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
         DEPENDS
             OpenColorIO
             ${CMAKE_BINARY_DIR}/docs/conf.py
@@ -115,7 +52,6 @@
             ${RSTDOC_OUTPUT}
         COMMENT "Building latex doc"
         SOURCES ${DOCFILES})
-    add_dependencies(latex Sphinx)
     
     add_custom_target(pdf ALL
         COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
@@ -125,6 +61,6 @@
     add_dependencies(pdf latex)
     
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P})
     
 endif()