CMake: More a2x / asciidoc fixes.

Create graphics directories and copy files into them similar
to Autotools and Nmake. Adjust some xsltproc arguments. Fix the
--asciidoc-opts flag.

Note: Admon graphics are broken pending change 3206.

Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4
Reviewed-on: https://code.wireshark.org/review/3805
Reviewed-by: Gerald Combs <gerald@wireshark.org>

2 files changed, 50 insertions, 34 deletions

diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake
index 6850b43cf6..19cb0395a1 100644
--- a/cmake/modules/FindASCIIDOC.cmake
+++ b/cmake/modules/FindASCIIDOC.cmake
@@ -26,16 +26,19 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ASCIIDOC DEFAULT_MSG A2X_EXECUTABLE)
 
 MARK_AS_ADVANCED(A2X_EXECUTABLE)
 
-MACRO( ASCIIDOC2HTML _output _asciidocsource _conffile )
+MACRO( ASCIIDOC2HTML _output _asciidocsource _conf_files )
     GET_FILENAME_COMPONENT( _source_base_name ${_asciidocsource} NAME_WE )
     set( A2X_HTML_OPTS --stylesheet=ws.css )
 
     SET( A2X_HTML_OPTS --stylesheet=ws.css )
+
+    SET( _conf_opts_list )
     FOREACH( _conf_file ${_conf_files} )
-        SET( _conf_opts_list ${_conf_opts_list} --conf_file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
+        SET( _conf_opts_list ${_conf_opts_list} --conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
-    STRING( REPLACE ";" " _conf_opts "${_conf_opts_list} )
+    STRING( REPLACE ";" " " _conf_opts "${_conf_opts_list}" )
 
+    SET( _conf_deps )
     FOREACH( _conf_file ${_conf_files} )
         SET( _conf_deps ${_conf_deps} ${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
@@ -71,11 +74,14 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files )
     endif()
 
     SET( A2X_HTML_OPTS --stylesheet=ws.css )
+
+    SET( _conf_opts_list )
     FOREACH( _conf_file ${_conf_files} )
-        SET( _conf_opts_list ${_conf_opts_list} --conf_file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
+        SET( _conf_opts_list ${_conf_opts_list} --conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
-    STRING( REPLACE ";" " _conf_opts "${_conf_opts_list} )
+    STRING( REPLACE ";" " " _conf_opts "${_conf_opts_list}" )
 
+    SET( _conf_deps )
     FOREACH( _conf_file ${_conf_files} )
         SET( _conf_deps ${_conf_deps} ${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
@@ -108,11 +114,14 @@ MACRO( ASCIIDOC2PDF _output _asciidocsource _conf_files _paper )
     GET_FILENAME_COMPONENT( _source_base_name ${_asciidocsource} NAME_WE )
 
     SET( A2X_HTML_OPTS --stylesheet=ws.css )
+
+    SET( _conf_opts_list )
     FOREACH( _conf_file ${_conf_files} )
-        SET( _conf_opts_list ${_conf_opts_list} --conf_file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
+        SET( _conf_opts_list ${_conf_opts_list} --conf-file=${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
-    STRING( REPLACE ";" " _conf_opts "${_conf_opts_list} )
+    STRING( REPLACE ";" " " _conf_opts "${_conf_opts_list}")
 
+    SET( _conf_deps )
     FOREACH( _conf_file ${_conf_files} )
         SET( _conf_deps ${_conf_deps} ${CMAKE_CURRENT_SOURCE_DIR}/${_conf_file} )
     ENDFOREACH()
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake
index 875809b6c0..2afc803926 100644
--- a/cmake/modules/FindXSLTPROC.cmake
+++ b/cmake/modules/FindXSLTPROC.cmake
@@ -25,64 +25,71 @@ MARK_AS_ADVANCED(XSLTPROC_EXECUTABLE)
 
 # Translate xml to html
 #XML2HTML(
-#        wsug.validated
-#        wsug_html/user-guide.html or wsub_html/index.html
+#        wsug or wsdg
 #        single-page or chunked
 #        WSUG_FILES
 #        WSUG_GRAPHICS
 #)
-MACRO(XML2HTML _validated _output _mode _xmlsources _gfxsources)
-    FOREACH(_tmpgfx ${${_gfxsources}})
-        set(_gfx ${_tmpgfx})
-        BREAK()
-    ENDFOREACH()
-    GET_FILENAME_COMPONENT(_GFXDIR ${_gfx} ABSOLUTE)
-    GET_FILENAME_COMPONENT(_GFXDIR ${_GFXDIR} PATH)
-    GET_FILENAME_COMPONENT(_OUTDIR ${_output} PATH)
-    SET(_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/${_OUTDIR})
+MACRO(XML2HTML _guide _mode _xmlsources _gfxsources)
+    SET(_validated ${_guide}.validated)
 
     IF(${_mode} STREQUAL "chunked")
+        SET(_basedir ${_guide}_html_chunked)
         SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
     ELSE() # single-page
+        SET(_basedir ${_guide}_html)
         SET(_STYLESHEET "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl")
     ENDIF()
 
+    SET(_outdir ${CMAKE_CURRENT_BINARY_DIR}/${_basedir})
+    SET(_output ${_basedir}/index.html)
+
+#    FOREACH(_tmpgfx ${${_gfxsources}})
+#        set(_gfx ${_tmpgfx})
+#        BREAK()
+#    ENDFOREACH()
+#    GET_FILENAME_COMPONENT(_GFXDIR ${_gfx} ABSOLUTE)
+#    GET_FILENAME_COMPONENT(_GFXDIR ${_GFXDIR} PATH)
+#    GET_FILENAME_COMPONENT(_OUTDIR ${_output} PATH)
+#    SET(_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/${_OUTDIR})
+
     FOREACH(_tmpsource ${${_xmlsources}})
         set(_source ${_tmpsource})
         BREAK()
     ENDFOREACH()
 
+    SET(_gfxdir ${_guide}_graphics)
     ADD_CUSTOM_COMMAND(
         OUTPUT
             ${_output}
         COMMAND cmake
-            -E make_directory ${_OUTDIR}
-        # Fixme: find out about subdirs (i.e. toolbar) automatically
-        #   so this works for wsdg as well.
-#        COMMAND cmake
-#           -E make_directory ${_OUTDIR}/${_GFXDIR}/toolbar
-#        COMMAND cp
-#           ${CMAKE_CURRENT_SOURCE_DIR}/${_GFXDIR}/*.* ${_OUTDIR}/${_GFXDIR}/
+            -E make_directory ${_outdir}
+        COMMAND cmake
+           -E make_directory ${_outdir}/${_gfxdir}/toolbar
+        COMMAND cp
+           ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/*.* ${_outdir}/${_gfxdir}/
 #        COMMAND cp
-#           ${CMAKE_CURRENT_SOURCE_DIR}/${_GFXDIR}/toolbar/*.* ${_OUTDIR}/${_GFXDIR}/toolbar/
+#           ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/*.* ${_outdir}/${_gfxdir}/
+        COMMAND cp
+           ${CMAKE_CURRENT_SOURCE_DIR}/${_gfxdir}/toolbar/*.* ${_outdir}/${_gfxdir}/toolbar/
         COMMAND cmake
-            -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ws.css ${_OUTDIR}
+            -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ws.css ${_outdir}
         COMMAND ${XSLTPROC_EXECUTABLE}
             --path "${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_BINARY_DIR}/wsluarm_src"
-            --stringparam img.src.path ${CMAKE_CURRENT_SOURCE_DIR}/
-            --stringparam base.dir ${_OUTDIR}/
+            --stringparam base.dir ${_basedir}/
             --stringparam use.id.as.filename 1
             --stringparam admon.graphics 1
-            --stringparam admon.graphics.path ${_GFXDIR}/
+            --stringparam admon.graphics.path ${_gfxdir}/
+#            --stringparam admon.graphics.extension .svg
             --stringparam section.autolabel 1
             --stringparam section.label.includes.component.label 1
             --stringparam html.stylesheet ws.css
             --nonet
-            --output ${_output}
+#            --output ${_output}
             ${_STYLESHEET}
             ${_source}
         COMMAND chmod
-            -R og+rX ${_OUTDIR}
+            -R og+rX ${_outdir}
         DEPENDS
             ${_validated}
             ${${_xmlsources}}
@@ -110,10 +117,10 @@ MACRO(XML2PDF _output _sources _stylesheet _paper)
             --path "${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_BINARY_DIR}/wsluarm_src"
             --stringparam paper.type ${_paper}
             --stringparam img.src.path ${CMAKE_CURRENT_SOURCE_DIR}/
-            --stringparam base.dir ${_OUTDIR}/
             --stringparam use.id.as.filename 1
             --stringparam admon.graphics 1
-            --stringparam admon.graphics.path ${_GFXDIR}/
+#            --stringparam admon.graphics.path ${CMAKE_CURRENT_SOURCE_DIR}/common_graphics/
+#            --stringparam admon.graphics.extension .svg
             --nonet
             --output ${_output}.fo
             ${_stylesheet}