osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/cmake/modules
History
Peter Wu 68698db8cc Always use html2text.py for FAQ, improve output 
A recent commit broke compilation with Python 3. The original author of
html2text.py is deceased and the fork has increased the number of files
for this "simple" helper.

The html2text.py script in this patch was rewritten and its output
matches with lynx (except for a few newlines around lists). This means
that indentation has been added for headings, paragraphs and lists.
Also, since it was written from scratch, a new license could be chosen
that matches Wireshark.

Since now the in-tree html2text.py script provides nicer output, remove
detection of the alternative programs (elinks, links). lynx/w3m is
somehow still necessary for asciidoc though.

(I also looked into reusing html2text.py for the release notes to
replace asciidoc, but the --format=html output produces different output
(HTML adds a ToC and section numbers). For now still require lynx for
release notes)

Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and
LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing
to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch
Linux x86_64. Test:

    # For each $PATH per python version, execute (with varying LC_ALL)
    help/faq.py -b | tools/html2text.py /dev/stdin | md5sum
    help/faq.py -b | tools/html2text.py | md5sum
    help/faq.py -b | tools/html2text.py
    help/faq.py -b | tools/html2text.py >/dev/null

Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd
Reviewed-on: https://code.wireshark.org/review/7779
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 		2015-03-25 07:08:52 +00:00
..
CMakeInstallDirs.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
COPYING-CMAKE-SCRIPTS Continue to remove $Id$ from top of file 2014-03-31 16:00:04 +00:00
CheckCCompilerFlag.cmake Another message from Clang for unknown -f and -m flags. 2014-06-18 18:46:09 +00:00
CheckCLinkerFlag.cmake - Reset a few more variables used in FindXYZ scripts. 2010-09-28 19:23:15 +00:00
FindADNS.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindAIRPCAP.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindASCIIDOC.cmake Fix ASCIIDOC detection broken by commit ae2888aeb2 2015-01-13 01:39:28 +00:00
FindCAP.cmake cmake: use pkg-config for resolving dependencies 2014-10-01 08:14:34 +00:00
FindCARES.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindChocolatey.cmake Win flex-bison and Chocolatey updates. 2014-08-07 21:54:54 +00:00
FindDOXYGEN.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindFOP.cmake CMake: Enable DocBook on Windows. 2015-01-08 22:05:38 +00:00
FindFreetype.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindGCRYPT.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGEOIP.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGLIB2.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGMODULE2.cmake Detecting gmodule2 on Homebrew almost worked... it behaves more like 2014-06-16 18:32:26 +00:00
FindGNUTLS.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindGTHREAD2.cmake CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows. 2014-10-20 23:42:11 +00:00
FindGTK2.cmake CMake: Copy wireshark-gtk dependent DLLs to the target directory. 2015-01-14 17:32:15 +00:00
FindGTK3.cmake CMake: Copy wireshark-gtk dependent DLLs to the target directory. 2015-01-14 17:32:15 +00:00
FindHtmlViewer.cmake cmake: Not all system have HtmlViewer 2014-05-30 12:47:12 +00:00
FindKERBEROS.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindLEX.cmake Win flex-bison and Chocolatey updates. 2014-08-07 21:54:54 +00:00
FindLUA.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindLYNX.cmake Always use html2text.py for FAQ, improve output 2015-03-25 07:08:52 +00:00
FindM.cmake Fix a problem that causes build failures with CMake on Yosemite. 2014-11-11 03:48:56 +00:00
FindNL.cmake cmake: use pkg-config for resolving dependencies 2014-10-01 08:14:34 +00:00
FindNSIS.cmake CMake: Add a top-level nsis_package target. 2015-03-12 22:47:42 +00:00
FindOS_X_FRAMEWORKS.cmake Fix OS X CMake build. 2014-06-24 07:10:12 +00:00
FindPCAP.cmake Have a #define for whether the capture buffer size can be set. 2015-03-25 03:22:33 +00:00
FindPOD.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindPORTAUDIO.cmake cmake: use pkg-config for resolving dependencies 2014-10-01 08:14:34 +00:00
FindPowerShell.cmake CMake: Copy data files to the run directory. 2015-01-18 20:09:23 +00:00
FindSBC.cmake Add Bluetooth SBC Codec support in cmake 2014-02-17 21:44:17 +00:00
FindSED.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindSETCAP.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindSH.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindSMI.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindWSWinLibs.cmake CMake: Set WIRESHARK_TARGET_PLATFORM. 2015-01-09 22:21:41 +00:00
FindWinSparkle.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
FindWireshark.cmake Fix missing space 2014-12-17 15:29:18 +00:00
FindXMLLINT.cmake CMake: Cygwin-ify the xmllint path as well. 2015-01-09 17:02:21 +00:00
FindXSLTPROC.cmake CMake: Look for FOP and HHC only when needed. 2015-01-14 23:27:41 +00:00
FindYACC.cmake Win flex-bison and Chocolatey updates. 2014-08-07 21:54:54 +00:00
FindYAPP.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
FindZLIB.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
GenerateTestSh.cmake Fix the exec call and paths in the test wrapper. 2015-03-07 05:04:32 +00:00
LICENSE.txt Remove some $Id$ lines 2014-07-12 14:31:51 +00:00
LocatePythonModule.cmake Fix Python 3 compatibility in LocatePythonModule 2014-12-21 08:54:24 +00:00
UseABICheck.cmake CMake: Copy libwireshark dependent DLLs to the target directory. 2015-01-13 19:25:10 +00:00
UseAsn2Wrs.cmake Use LocatePythonModule to locate asn2wrs.py 2014-12-18 07:43:22 +00:00
UseCheckAPI.cmake Update CMake "Project names" and Folders 2015-01-11 00:09:14 +00:00
UseCustomIncludes.cmake Having CmakeListsCustom.txt in git defeats the purpose of its existence: 2014-09-18 07:02:00 +00:00
UseLemon.cmake Revert "Lemon: Update lemon tools" 2015-01-11 19:57:45 +00:00
UseMakeDissectorReg.cmake Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable. 2014-12-18 07:42:39 +00:00
UseMakeTapReg.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
UseWinLibs.cmake Continue to remove $Id$ from top of file 2014-03-31 18:48:06 +00:00
WiresharkConfig.cmake.in Add Wireshark_LIBRARY variable 2014-12-16 16:04:55 +00:00
WiresharkConfigVersion.cmake.in Add cmake helper files for finding wireshark 2014-12-16 14:18:02 +00:00
WiresharkPlugin.cmake CMake: Add a top-level nsis_package target. 2015-03-12 22:47:42 +00:00
gmxTestLargeFiles.cmake Copy over cmake largfile detection from the gromacs project. 2013-07-23 09:40:21 +00:00
hhc.cmake CMake: Migrate to hhc.cmake. 2015-01-09 17:49:37 +00:00
readme.txt More SVN properties cleanup. 2013-10-27 01:11:15 +00:00

readme.txt 

The following modules have been copied from CMake trunk _without_ modifications:

* FindZLIB.cmake