diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-03-21 11:57:01 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-25 07:08:52 +0000 |
| commit | 68698db8ccec8733929752c4b13da71dcad6213e (patch) | |
| tree | 99f299c4296e94f78038fc8666d987e81a639974 /config.nmake | |
| parent | 83b6338673d1f1e0035c34021199b90730da73fd (diff) | |
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>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/config.nmake b/config.nmake index 19c9723760..6f95af7b01 100644 --- a/config.nmake +++ b/config.nmake @@ -79,8 +79,7 @@ PROGRAM_FILES=$(PROGRAMFILES) PROGRAM_FILES_W6432=$(PROGRAMW6432) # -# Location of the "tools" directory. This affects HTML2TXT below and should -# be overridden by makefiles in any subdirectories that use HTML2TXT. +# Location of the "tools" directory. This affects the path to textify.ps1 !IFNDEF TOOLS_DIR TOOLS_DIR=tools !ENDIF @@ -1321,17 +1320,6 @@ FOP=$(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat # Additional options to fop. FOP_OPTS=-Xmx256m -# html to text converter for text version of release notes, e.g. elinks. -# This could also be "lynx", or "true" if neither elinks nor lynx is installed -# (cygwin: lynx works, elinks not available, links and true doesn't produce output) -#HTML2TXT=elinks -dump -dump-width 72 -##HTML2TXT=links -dump -width 72 ## XXX: Fails: For links -dump requires 'url' (filename) arg. -#HTML2TXT=lynx -dump -width=72 -nolist -stdin - -!IFNDEF HTML2TXT -HTML2TXT=$(PYTHON) $(TOOLS_DIR)\html2text.py --width=72 --no-links -!ENDIF - # the XSL processor (part of cygwin's libxslt package) XSLTPROC="xsltproc" |