osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Doc: Have make-authors*.pl explicitly use UTF-8. 

Our authors lists and man pages are encoded as UTF-8 and have been for
quite a while. Remove perlnoutf.pl and ensure that standard I/O uses
UTF-8 as described at

https://www.perl.com/pub/2012/05/perlunicook-make-all-io-default-to-utf-8.html/

Change-Id: I7016ec5e3a12934463b43bcfdde2c424069c20ac
Reviewed-on: https://code.wireshark.org/review/37817
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2020-07-09 10:17:59 -07:00 committed by Anders Broman
parent 770872790d
commit 3b86e04c2d
4 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/CMakeLists.txt
View File

@ -10,12 +10,10 @@
add_custom_command(
OUTPUT AUTHORS-SHORT
COMMAND ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/perlnoutf.pl
${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.pl
< ${CMAKE_SOURCE_DIR}/AUTHORS
> ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/perlnoutf.pl
${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.pl
${CMAKE_SOURCE_DIR}/AUTHORS
)
@ -23,12 +21,10 @@ add_custom_command(
add_custom_command(
OUTPUT AUTHORS-SHORT-FORMAT
COMMAND ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/perlnoutf.pl
${CMAKE_CURRENT_SOURCE_DIR}/make-authors-format.pl
< ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT
> ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT-FORMAT
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/perlnoutf.pl
${CMAKE_CURRENT_SOURCE_DIR}/make-authors-format.pl
${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT
)

3
doc/make-authors-format.pl
View File

@ -1,8 +1,6 @@
# Convert AUTHORS-SHORT file for use in man page and HTML documentation
# after processing through pod2man and pod2html.
#
# Must be called via perlnoutf.
#
# Copyright 2004 Graeme Hewson <ghewson@wormhole.me.uk>
#
# Wireshark - Network traffic analyzer
@ -13,6 +11,7 @@
#
use strict;
use open qw(:std :utf8);
# This might not be necessary.
print "=for html <style>div#authors pre, div#authors pre code { white-space: pre-wrap; }</style>\n\n";

3
doc/make-authors-short.pl
View File

@ -1,8 +1,6 @@
# Remove tasks from individual author entries from AUTHORS file
# for use in the about dialog.
#
# Must be called via perlnoutf.
#
# Copyright 2004 Ulf Lamping <ulf.lamping@web.de>
#
# Wireshark - Network traffic analyzer
@ -13,6 +11,7 @@
#
use strict;
use open qw(:std :utf8);
my $subinfo=0;
my $nextline;

22
doc/perlnoutf.pl
View File

@ -1,22 +0,0 @@
#!/usr/bin/perl -w
# Call another Perl script, passing our caller's arguments, with
# environment variables unset so perl doesn't interpret bytes as UTF-8
# characters.
#
# Copyright 2004 Graeme Hewson <ghewson@wormhole.me.uk>
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
use strict;
delete $ENV{LANG};
delete $ENV{LANGUAGE};
delete $ENV{LC_ALL};
delete $ENV{LC_CTYPE};
system("$^X -w @ARGV");