diff options
| author | Gerald Combs <gerald@zing.org> | 2014-02-09 11:01:49 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-11 18:04:45 +0000 |
| commit | 5e3113e7c96c515d70288cdb5b44e0ebdc5b5711 (patch) | |
| tree | 8016b9c3ab9272065976e5ee2a3c7b540d8c50d5 /cmake | |
| parent | bed30b8a94b645361a00d70ee2db0ec184cae103 (diff) | |
| download | wireshark-5e3113e7c96c515d70288cdb5b44e0ebdc5b5711.tar.gz wireshark-5e3113e7c96c515d70288cdb5b44e0ebdc5b5711.tar.bz2 wireshark-5e3113e7c96c515d70288cdb5b44e0ebdc5b5711.zip | |
Finish converting the Developer's Guide to AsciiDoc.
Add developer-guide-docinfo.xml, which lets us carry over DocBook front
matter. Remove the meta_info chapter. Most of its contents are now in
developer-guide-docinfo.xml. Add a DocBook revision history based on
hints from the Git/SVN/CVS revision history.
Comment out or note makefile content that's no longer necessary for
converting the Developer's Guide but will be useful for converting the
User's Guide. Fix building the release notes with CMake. Other minor
changes. Tested with Autotools, nmake, and CMake.
Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a
Reviewed-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindASCIIDOC.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index c3735e0ba5..221781e19f 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -38,7 +38,8 @@ MACRO( ASCIIDOC2HTML _output _asciidocsource _conffile ) COMMAND ${A2X_EXECUTABLE} --format=xhtml --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - # --conf-file=${_conffile} + --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" + --fop ${A2X_HTML_OPTS} ${_asciidocsource} # Replacing file with itself will fail @@ -65,7 +66,8 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conffile ) COMMAND ${A2X_EXECUTABLE} --format=text --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - # --conf-file=${_conffile} + --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" + --fop ${A2X_TEXT_OPTS} --xsltproc-opts '--stringparam generate.toc "article nop"' ${_asciidocsource} @@ -91,7 +93,8 @@ MACRO( ASCIIDOC2PDF _output _asciidocsource _conffile _paper ) COMMAND ${A2X_EXECUTABLE} --format=pdf --destination-dir=${CMAKE_CURRENT_BINARY_DIR} - # --conf-file=${_conffile} + --asciidoc-opts="--conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conffile}" + --fop ${A2X_HTML_OPTS} --xsltproc-opts "--stringparam paper.type ${_paper} --nonet" --xsl-file=custom_layer_pdf.xsl |