From a1837263708cda91caec1691a469ad1415924a8e Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 17 Mar 2016 17:19:18 -0700
Subject: DocBook: Don't require xmllint.

Remove dependencies on xmllint. We don't write DocBook by hand any more
and we haven't used it in a long time in the CMake builds.

Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1
Reviewed-on: https://code.wireshark.org/review/14506
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 cmake/modules/FindXMLLINT.cmake  | 73 ----------------------------------------
 cmake/modules/FindXSLTPROC.cmake |  2 --
 2 files changed, 75 deletions(-)
 delete mode 100644 cmake/modules/FindXMLLINT.cmake

(limited to 'cmake')

diff --git a/cmake/modules/FindXMLLINT.cmake b/cmake/modules/FindXMLLINT.cmake
deleted file mode 100644
index aee58c80ff..0000000000
--- a/cmake/modules/FindXMLLINT.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# - Find unix commands from cygwin
-# This module looks for some usual Unix commands.
-#
-
-INCLUDE(FindCygwin)
-
-FIND_PROGRAM(XMLLINT_EXECUTABLE
-    NAMES
-        xmllint
-    PATHS
-        ${CYGWIN_INSTALL_PATH}/bin
-        /bin
-        /usr/bin
-        /usr/local/bin
-        /sbin
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XMLLINT DEFAULT_MSG XMLLINT_EXECUTABLE)
-
-MARK_AS_ADVANCED(XMLLINT_EXECUTABLE)
-
-if (WIN32 AND NOT "${CYGWIN_INSTALL_PATH}" STREQUAL "" AND ${XMLLINT_EXECUTABLE} MATCHES "${CYGWIN_INSTALL_PATH}")
-    FIND_PROGRAM(CYGPATH_EXECUTABLE
-        NAMES cygpath
-        PATHS ${CYGWIN_INSTALL_PATH}/bin
-    )
-    # XXX Duplicate of TO_A2X_COMPATIBLE_PATH
-    MACRO( TO_XMLLINT_COMPATIBLE_PATH _cmake_path _result )
-        execute_process(
-            COMMAND ${CYGPATH_EXECUTABLE} -u ${_cmake_path}
-            OUTPUT_VARIABLE _cygwin_path
-        )
-        # cygpath adds a linefeed.
-        string(STRIP "${_cygwin_path}" _cygwin_path)
-
-        set( ${_result} ${_cygwin_path} )
-    ENDMACRO()
-
-    TO_XMLLINT_COMPATIBLE_PATH( ${CMAKE_CURRENT_SOURCE_DIR} _xmllint_current_source_dir )
-    TO_XMLLINT_COMPATIBLE_PATH( ${CMAKE_CURRENT_BINARY_DIR} _xmllint_current_binary_dir )
-
-    set ( _xmllint_path "${_xmllint_current_source_dir}:${_xmllint_current_binary_dir}:${_xmllint_current_binary_dir}/wsluarm_src")
-else()
-    set ( _xmllint_path "${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_BINARY_DIR}/wsluarm_src")
-endif()
-
-# Validate XML
-# XXX Unused?
-MACRO(VALIDATE_XML _validated _sources)
-    # FIXME: How do I extract the first element of a variable containing a
-    # list of values? Isn't there a "cleaner" solution?
-    # Oh, and I have no idea why I can't directly use _source instead of
-    # having to introduce _tmpsource.
-    FOREACH(_tmpsource ${${_sources}})
-        set(_source ${_tmpsource})
-        BREAK()
-    ENDFOREACH()
-    ADD_CUSTOM_COMMAND(
-        OUTPUT
-            ${_validated}
-        COMMAND ${XMLLINT_EXECUTABLE}
-            --path "${_xmllint_path}"
-            --valid
-            --noout
-            ${_source}
-        COMMAND ${CMAKE_COMMAND} -E touch
-            ${_validated}
-        DEPENDS
-            ${${_sources}}
-    )
-ENDMACRO(VALIDATE_XML)
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake
index 6b3b71df4a..ea1d688ee8 100644
--- a/cmake/modules/FindXSLTPROC.cmake
+++ b/cmake/modules/FindXSLTPROC.cmake
@@ -78,7 +78,6 @@ endif()
 MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources)
     # We depend on the docbook target to avoid parallel builds.
     SET(_dbk_dep ${_target_dep}_docbook)
-    #SET(_validated ${_dir_pfx}.validated)
 
     IF(${_mode} STREQUAL "chunked")
         SET(_basedir ${_dir_pfx}_html_chunked)
@@ -129,7 +128,6 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources)
         DEPENDS
             generate_${_dbk_source}
             ${_dbk_dep}
-            #${_validated}
             ${_gfx_deps}
     )
     IF(NOT WIN32)
-- 
cgit v1.2.3