diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-11 11:03:56 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-02-12 19:19:11 +0000 |
| commit | 8ebbf99173984bf44e78ff7fec2a8ab082c1c8ae (patch) | |
| tree | 46827da94fd869b94ac978843617cb421e34a75c /cmake | |
| parent | 3b940d2a83a8d51f3de1284acec28171f6cac8c9 (diff) | |
Remove Lynx.
Use tools/html2text.py to convert HTML to text.
Remove some now-obsolete documentation.
Change-Id: Ib21a1ab10c789182da5fcc68e98917a00f2fa650
Reviewed-on: https://code.wireshark.org/review/25733
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindAsciidoctor.cmake | 37 | ||||
| -rw-r--r-- | cmake/modules/FindLYNX.cmake | 24 |
2 files changed, 17 insertions, 44 deletions
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index f2a6e8ccdb..d5be880efe 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -89,26 +89,23 @@ if(ASCIIDOCTOR_EXECUTABLE) ENDMACRO() MACRO( ASCIIDOCTOR2TXT _asciidocsource ) - if( LYNX_EXECUTABLE ) - GET_FILENAME_COMPONENT( _source_base_name ${_asciidocsource} NAME_WE ) - set( _output_html ${_source_base_name}.html ) - set( _output_txt ${_source_base_name}.txt ) - - ADD_CUSTOM_COMMAND( - OUTPUT - ${_output_txt} - COMMAND ${LYNX_EXECUTABLE} - -dump - ${_output_html} - > ${_output_txt} - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} - ${_output_html} - ${ARGN} - ) - unset(_output_html) - unset(_output_txt) - endif( LYNX_EXECUTABLE ) + GET_FILENAME_COMPONENT( _source_base_name ${_asciidocsource} NAME_WE ) + set( _output_html ${_source_base_name}.html ) + set( _output_txt ${_source_base_name}.txt ) + + ADD_CUSTOM_COMMAND( + OUTPUT + ${_output_txt} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py + ${_output_html} + > ${_output_txt} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} + ${_output_html} + ${ARGN} + ) + unset(_output_html) + unset(_output_txt) ENDMACRO() # news: release-notes.txt diff --git a/cmake/modules/FindLYNX.cmake b/cmake/modules/FindLYNX.cmake deleted file mode 100644 index 654c9442e7..0000000000 --- a/cmake/modules/FindLYNX.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# -# This module looks for an HTML to plain text converter which accepts -# a "-dump" argument. -# -# Lynx is preferred since it generates URL footnotes. -# - -INCLUDE(FindCygwin) - -FIND_PROGRAM(LYNX_EXECUTABLE - NAMES - lynx w3m links - PATHS - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin - /usr/local/bin - /sbin -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LYNX DEFAULT_MSG LYNX_EXECUTABLE) - -MARK_AS_ADVANCED(LYNX_EXECUTABLE) |