This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/115956/

Ship it!

Ship It!

- Alex Merry


On February 23rd, 2014, 3:02 p.m. UTC, Luigi Toscano wrote:

Review request for Documentation and KDE Frameworks.
By Luigi Toscano.

Updated Feb. 23, 2014, 3:02 p.m.

Repository: kdoctools

Description

This is the combination of two RR, now that FindDocBookXML.cmake/FindDocBookXSL.cmake have been moved to kdoctools:
- https://git.reviewboard.kde.org/r/115876/
- https://git.reviewboard.kde.org/r/115879/

Combination of few commits:
1) More generic structure for FindDocBookXML
    
- allows modules to request a generic version of DocBook XML
- keep compatibility variables for now
(originally from 115876)
-------------------
2) Rename as FindDocBookXML4, it will be used only for DocBook 4.x
    
The rename reflects the fact that it is used for DocBookXML4 only;
a future DocBookXML5 could be added if needed.
(originally from 115876)

Use the new module name in CMake files.
(originally from 115879)
--------------------
3) New DocBookXML4_* variables, explicitly require the DocBookXML4 version
(originally from 115879)
--------------------
4) Move DocBookXML4 DESCRIPTION and URL into the cmake file
--------------------
5) Move DocBookXSL DESCRIPTION and URL into the cmake file

Testing

Compiles, documentation is generated.

Diffs

  • CMakeLists.txt (5ad7099)
  • cmake/FindDocBookXML.cmake (b6d623e)
  • cmake/FindDocBookXML4.cmake (PRE-CREATION)
  • cmake/FindDocBookXSL.cmake (a7320ae)
  • config-kdoctools.h.cmake (f2fe22c)
  • src/CMakeLists.txt (71a7d2e)
  • src/customization/dtd/kdex.dtd.cmake (c643d9b)

View Diff