[kde-doc-english] [rocs/graphtheory] /: Reenable docbook.

Andreas Cord-Landwehr cordlandwehr at kde.org
Sun Aug 17 14:36:32 UTC 2014


Git commit f1cc7506767558a80cd8fd9cf7ba00c9054e77f9 by Andreas Cord-Landwehr.
Committed on 13/08/2014 at 10:38.
Pushed by cordlandwehr into branch 'graphtheory'.

Reenable docbook.

M  +3    -2    CMakeLists.txt
M  +24   -1    doc/CMakeLists.txt
M  +1    -1    doc/index.docbook

http://commits.kde.org/rocs/f1cc7506767558a80cd8fd9cf7ba00c9054e77f9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffe69ab..c55b08c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ project(rocs)
 cmake_minimum_required(VERSION 2.8.11)
 
 find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+find_package(KF5DocTools)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 include(ECMAddTests)
 include(ECMInstallIcons)
@@ -88,12 +89,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 ecm_optional_add_subdirectory(RocsCore)
 ecm_optional_add_subdirectory(libgraphtheory)
 ecm_optional_add_subdirectory(src)
+ecm_optional_add_subdirectory(icons)
+ecm_optional_add_subdirectory(doc)
 
 # feature log
 if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
     feature_summary(WHAT ALL)
 endif(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 
-ecm_optional_add_subdirectory(icons)
-# ecm_optional_add_subdirectory(doc) //FIXME port documentation
 install(FILES rocs.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index fc3948c..cca96df 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1,24 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR rocs)
+#  Copyright 2013-2014  Andreas Cord-Landwehr <cordlandwehr at kde.org>
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+#  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+#  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+#  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+#  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+#  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR rocs)
diff --git a/doc/index.docbook b/doc/index.docbook
index e4980c4..2851f49 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
 
   <!ENTITY kappname "&rocs;">
   <!ENTITY package "rocs">



More information about the kde-doc-english mailing list