anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tools(listFontWithLang.pl): Discard use of deprecated perl-module Getopt::Mixed

Browse Source 
According to CTAN, this module is effectively obsolete.
Using Getopt::Long instead now, since it is also part
of the standard Perl distribution.
This commit is contained in:
Kornel Benko 2022-02-05 20:04:06 +01:00
parent 28dd7b7de3
commit 0370cc428c
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
development/tools/GetOptions.pm
View File

@ -10,7 +10,7 @@
# Full author contact details are available in the file CREDITS # Full author contact details are available in the file CREDITS
# or at https://www.lyx.org/Credits # or at https://www.lyx.org/Credits
# #
# Used as wrapper for Getopt::Mixed # Used as wrapper for Getopt::Long
# as # as
# use GetOptions; # use GetOptions;
# ... # ...
@ -33,9 +33,9 @@ BEGIN {
} }
use warnings; use warnings;
use Getopt::Mixed; use Getopt::Long;
sub makeOpts(); # Create option spec for Getopt::Mixed::init() sub makeLongOpts(); # Create option spec for Getopt::Long::GetOptions();
sub makeHelp(); # Create help-string to describe options sub makeHelp(); # Create help-string to describe options
# Following fields for a parameter can be defined: # Following fields for a parameter can be defined:
@ -69,15 +69,24 @@ sub handleOptions($)
$optionsDef{v}->{comment} = "Display recognized params"; $optionsDef{v}->{comment} = "Display recognized params";
$optionsDef{v}->{Sort} = 1; $optionsDef{v}->{Sort} = 1;
my %options = ("help" => 0); use vars qw(%options);
my $opts = &makeOpts(); %options = ("help" => 0);
Getopt::Mixed::init($opts); {
while( my( $option, $value, $pretty ) = Getopt::Mixed::nextOption()) { my $roptr = &makeLongOpts();
my $p = Getopt::Long::Parser->new;
$p->configure("bundling");
$p->getoptions(%{$roptr});
}
# Callback routine called by $p->getoptions().
sub handleopts($$$)
{
my ($option, $value, $unknown) = @_;
if (defined($optionsDef{$option})) { if (defined($optionsDef{$option})) {
my $fieldname = $optionsDef{$option}->{fieldname}; my $fieldname = $optionsDef{$option}->{fieldname};
if (exists($options{$fieldname}) && ($option ne "h")) { if (exists($options{$fieldname}) && ($option ne "h")) {
print "Option $option already set\n"; print "Option $option already set\n";
if (defined($options{$fieldname})) { if (defined($options{$fieldname})) {
print "Value \"$value\" would overwrite "; print "Value \"$value\" would overwrite ";
if (ref($options{$fieldname}) eq "ARRAY") { if (ref($options{$fieldname}) eq "ARRAY") {
@ -87,8 +96,8 @@ sub handleOptions($)
print "\"$options{$fieldname}\"\n"; print "\"$options{$fieldname}\"\n";
} }
} }
$option = "h"; $option = "h";
$fieldname = "help"; $fieldname = "help";
} }
if ($option eq "h") { if ($option eq "h") {
print "Syntax: $0 options xxxx ...\n"; print "Syntax: $0 options xxxx ...\n";
@ -111,7 +120,6 @@ sub handleOptions($)
} }
} }
Getopt::Mixed::cleanup();
if (exists($options{verbose})) { if (exists($options{verbose})) {
printf("Found following options:\n %-16soptvalue\n", "option"); printf("Found following options:\n %-16soptvalue\n", "option");
print " " . "-" x 32 . "\n"; print " " . "-" x 32 . "\n";
@ -139,29 +147,25 @@ sub handleOptions($)
############################################################# #############################################################
# Create option spec for Getopt::Mixed::init() # Create option spec for Getopt::Long::GetOptions()
sub makeOpts() sub makeLongOpts()
{ {
my $first = 1; my %opts = ();
my $opts = "";
for my $ex (sort keys %optionsDef) { for my $ex (sort keys %optionsDef) {
my $e = $optionsDef{$ex}; my $e = $optionsDef{$ex};
if (! $first) { my $type = "";
$opts .= " ";
}
$first = 0;
$opts .= $ex;
if (defined($e->{type})) { if (defined($e->{type})) {
my $tp = $e->{type}; $type = $e->{type};
$opts .= $tp;
} }
my $optx = $ex;
if (defined($e->{alias})) { if (defined($e->{alias})) {
for my $a (@{$e->{alias}}) { for my $a (@{$e->{alias}}) {
$opts .= " $a>$ex"; $optx .= "|$a";
} }
} }
$opts{"$optx$type"} = \&handleopts;
} }
return($opts); return \%opts; # to be used by Getopt::Long();
} }
sub sortHelp sub sortHelp