diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-02-10 16:11:20 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-02-11 21:09:46 +0000 |
| commit | 53b2994b430c94ae1bc33f0fc0e694cf96c09bfd (patch) | |
| tree | f5e5adef9b0c88a3d7b43ec411fb4660c72b8332 /cmake/modules/FindXSLTPROC.cmake | |
| parent | dedad3403a14af3de414a343d64e04b11636f6a7 (diff) | |
Docbook: Reorganize our guide directories
Move the top-level user-guide.adoc and developer-guide.adoc to their
respective source directores. This is in preparation for a future
toolchain revamp.
Move the wsug_graphics directory to wsug_src/images and wsdg_graphics
directory to wsdg_src/images. Copy common_graphics/* to the each images
directory and remove common_graphics. We only have five admonition
graphics; duplicating them lets us remove some build config overhead.
Rename wsluarm.adoc to wsdg_src/wsdg_lua_support.adoc.
Remove a dummy file.
Tested visually and by enabling `--failure-level=WARN`.
Diffstat (limited to 'cmake/modules/FindXSLTPROC.cmake')
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index b4f0ac857d..ff4120baed 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -105,27 +105,21 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) set(_gfx_deps ${CMAKE_CURRENT_SOURCE_DIR}/${_tmpgfx}) ENDFOREACH() - SET(_gfx_dir ${_dir_pfx}_graphics) + SET(_gfx_src_dir ${_dir_pfx}_src/images) ADD_CUSTOM_COMMAND( OUTPUT ${_output} COMMAND ${CMAKE_COMMAND} -E make_directory ${_out_dir} COMMAND ${CMAKE_COMMAND} - -E make_directory ${_out_dir}/${_gfx_dir}/toolbar - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_dir} ${_out_dir}/${_gfx_dir} - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics ${_out_dir}/${_gfx_dir} - COMMAND ${CMAKE_COMMAND} - -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_dir}/toolbar ${_out_dir}/${_gfx_dir}/toolbar + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_src_dir} ${_out_dir}/images COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ws.css ${_out_dir} COMMAND ${XSLTPROC_EXECUTABLE} --path "${_xsltproc_path}" --stringparam base.dir ${_basedir}/ ${_common_xsltproc_args} - --stringparam admon.graphics.path ${_gfx_dir}/ + --stringparam admon.graphics.path images/ ${_modeparams} --noout ${_stylesheet} ${_dbk_source} @@ -135,6 +129,17 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) ${_gfx_deps} custom_layer_single_html.xsl ) + if(${_dir_pfx} STREQUAL wsug) + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output} + COMMAND ${CMAKE_COMMAND} + -E make_directory ${_out_dir}/images/toolbar + COMMAND ${CMAKE_COMMAND} + -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${_gfx_src_dir}/toolbar ${_out_dir}/images/toolbar + APPEND + ) + endif() IF(NOT WIN32) ADD_CUSTOM_COMMAND( OUTPUT |