From 103389822ea3b612298b8fc7c46a338a3773fe05 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 2 Jun 2009 13:11:16 +0200 Subject: [PATCH] Add cmake detection for asciidoc version --- CMakeLists.txt | 4 +--- cmake/FindAsciidoc.cmake | 43 ++++++++++++++++++++++++++++++++++++++ debian/weechat-doc.install | 2 +- doc/CMakeLists.txt | 16 +++++++------- doc/en/CMakeLists.txt | 12 +++++------ doc/fr/CMakeLists.txt | 12 +++++------ 6 files changed, 65 insertions(+), 24 deletions(-) create mode 100644 cmake/FindAsciidoc.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 42405db1d..065ebbc31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,9 +63,7 @@ OPTION(DISABLE_DOC "Disable Doc") ADD_SUBDIRECTORY( po ) ADD_SUBDIRECTORY( src ) -IF(NOT DISABLE_DOC) - ADD_SUBDIRECTORY( doc ) -ENDIF(NOT DISABLE_DOC) +ADD_SUBDIRECTORY( doc ) CONFIGURE_FILE(config.h.cmake config.h @ONLY) diff --git a/cmake/FindAsciidoc.cmake b/cmake/FindAsciidoc.cmake new file mode 100644 index 000000000..6247d49a4 --- /dev/null +++ b/cmake/FindAsciidoc.cmake @@ -0,0 +1,43 @@ +# Copyright (c) 2003-2009 FlashCode +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# - Find Asciidoc +# This module finds if asciidoc (version 8 or newer) is installed. + +IF (ASCIIDOC_FOUND) + # Already in cache, be silent + SET(ASCIIDOC_FIND_QUIETLY TRUE) +ENDIF (ASCIIDOC_FOUND) + +FIND_PROGRAM( + ASCIIDOC_EXECUTABLE asciidoc + PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin +) + +IF(ASCIIDOC_EXECUTABLE) + EXECUTE_PROCESS( + COMMAND ${ASCIIDOC_EXECUTABLE} --version + OUTPUT_VARIABLE ASCIIDOC_VERSION + ) + + IF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*") + SET(ASCIIDOC_FOUND TRUE) + ENDIF(${ASCIIDOC_VERSION} MATCHES "asciidoc 8.*") + + MARK_AS_ADVANCED( + ASCIIDOC_EXECUTABLE + ) +ENDIF(ASCIIDOC_EXECUTABLE) diff --git a/debian/weechat-doc.install b/debian/weechat-doc.install index af4e1e0ba..701d9837a 100644 --- a/debian/weechat-doc.install +++ b/debian/weechat-doc.install @@ -1 +1 @@ -usr/share/doc/weechat/html usr/share/doc/weechat-doc +usr/share/doc/weechat usr/share/doc/weechat-doc diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index d8b132fa8..d7699c516 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -14,14 +14,14 @@ # along with this program. If not, see . # -FIND_PROGRAM( - ASCIIDOC asciidoc - PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin -) +IF(NOT DISABLE_DOC) -IF(ASCIIDOC) - ADD_SUBDIRECTORY( en ) - ADD_SUBDIRECTORY( fr ) -ENDIF(ASCIIDOC) + FIND_PACKAGE(Asciidoc) + IF(ASCIIDOC_FOUND) + ADD_SUBDIRECTORY( en ) + ADD_SUBDIRECTORY( fr ) + ENDIF(ASCIIDOC_FOUND) + +ENDIF(NOT DISABLE_DOC) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION share/man/man1) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index d946ee93a..185bb8bf9 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -17,7 +17,7 @@ # user's guide ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt @@ -29,7 +29,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION share # plugin API reference ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt @@ -41,7 +41,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION # scripting guide ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt COMMENT "Building weechat_scripting.en.html" @@ -52,7 +52,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION # FAQ ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt COMMENT "Building weechat_faq.en.html" @@ -63,7 +63,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION share/ # quickstart ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt COMMENT "Building weechat_quickstart.en.html" @@ -74,7 +74,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION # tester's guide ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt COMMENT "Building weechat_tester.en.html" diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt index 14c6d5ad9..95aa91131 100644 --- a/doc/fr/CMakeLists.txt +++ b/doc/fr/CMakeLists.txt @@ -17,7 +17,7 @@ # user's guide ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt @@ -29,7 +29,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION share # plugin API reference #ADD_CUSTOM_COMMAND( # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html -# COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt +# COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt # DEPENDS # ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt # ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt @@ -41,7 +41,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION share # scripting guide #ADD_CUSTOM_COMMAND( # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html -# COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt +# COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt # DEPENDS # ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt # COMMENT "Building weechat_scripting.fr.html" @@ -52,7 +52,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION share # FAQ ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt COMMENT "Building weechat_faq.fr.html" @@ -63,7 +63,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION share/ # quickstart ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt COMMENT "Building weechat_quickstart.fr.html" @@ -74,7 +74,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION # tester's guide ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html - COMMAND ${ASCIIDOC} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt + COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt COMMENT "Building weechat_tester.fr.html"