From d3e2f1053bebd9550b1c4befe83c540a4a349796 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 23 Jun 2022 13:09:30 -0700 Subject: [PATCH] Doc: Port make-authors-short to Python3. Port the script that creates AUTHORS-SHORT to Python3. Ping #18152. --- doc/CMakeLists.txt | 6 ++--- doc/make-authors-short.pl | 39 ------------------------------- doc/make-authors-short.py | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 42 deletions(-) delete mode 100755 doc/make-authors-short.pl create mode 100755 doc/make-authors-short.py diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 156ef650a8..0626c24dcb 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -11,12 +11,12 @@ find_package( Asciidoctor 1.5 ) add_custom_command( OUTPUT AUTHORS-SHORT - COMMAND ${PERL_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.pl + COMMAND ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.py < ${CMAKE_SOURCE_DIR}/AUTHORS > ${CMAKE_CURRENT_BINARY_DIR}/AUTHORS-SHORT DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.pl + ${CMAKE_CURRENT_SOURCE_DIR}/make-authors-short.py ${CMAKE_SOURCE_DIR}/AUTHORS ) diff --git a/doc/make-authors-short.pl b/doc/make-authors-short.pl deleted file mode 100755 index 1b8286e904..0000000000 --- a/doc/make-authors-short.pl +++ /dev/null @@ -1,39 +0,0 @@ -# Remove tasks from individual author entries from AUTHORS file -# for use in the about dialog. -# -# Copyright 2004 Ulf Lamping -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# SPDX-License-Identifier: GPL-2.0-or-later -# - -use strict; -use open qw(:std :utf8); - -my $subinfo=0; -my $nextline; - -$_ = <>; -s/\xef\xbb\xbf//; # Skip UTF-8 byte order mark -print unless /^\n/; - -while (<>) { - if (/(.*?)\s*\{/) { - $subinfo = 1; - print "$1\n"; - } elsif (/\}/) { - $subinfo = 0; - if (($nextline = <>) !~ /^[\s]*$/) { - print STDERR "No blank line after '}', found: $nextline" - if $nextline =~ m/\{/; - print $nextline; - } - } elsif ($subinfo == 1) { - next; - } else { - print; - } -} diff --git a/doc/make-authors-short.py b/doc/make-authors-short.py new file mode 100755 index 0000000000..08b56e98d3 --- /dev/null +++ b/doc/make-authors-short.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +# +# Generate the AUTHORS-SHORT file. +# Ported from make-authors-short.pl, copyright 2004 Ulf Lamping +# +# By Gerald Combs