ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary begin blocks in Perl source files.

Browse Source
This commit is contained in:
Sadie Powell 2021-01-25 12:13:54 +00:00
parent cc28ba0f21
commit f6b861f12d
15 changed files with 35 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -30,11 +30,7 @@
#
BEGIN {
require 5.10.0;
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

13
make/calcdep.pl
View File

@ -21,20 +21,13 @@
#
BEGIN {
push @INC, $ENV{SOURCEPATH};
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use strict;
use warnings FATAL => qw(all);
use File::Basename qw(basename);
use File::Basename qw(basename dirname);
use FindBin qw($RealDir);
use lib dirname $RealDir;
use make::common;
use constant {

6
make/common.pm
View File

@ -17,13 +17,9 @@
#
BEGIN {
require 5.10.0;
}
package make::common;
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

6
make/configure.pm
View File

@ -21,13 +21,9 @@
#
BEGIN {
require 5.10.0;
}
package make::configure;
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

6
make/console.pm
View File

@ -19,11 +19,7 @@
package make::console;
BEGIN {
require 5.10.0;
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

6
make/directive.pm
View File

@ -19,11 +19,7 @@
package make::directive;
BEGIN {
require 5.10.0;
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

9
make/unit-cc.pl
View File

@ -22,16 +22,15 @@
#
BEGIN {
push @INC, $ENV{SOURCEPATH};
require 5.10.0;
}
use v5.10.0;
use strict;
use warnings FATAL => qw(all);
use File::Basename qw(dirname);
use File::Spec::Functions qw(abs2rel);
use FindBin qw($RealDir);
use lib dirname $RealDir;
use make::console;
use make::directive;

15
modulemanager
View File

@ -22,7 +22,6 @@
BEGIN {
require 5.10.0;
unless (eval "use LWP::Simple; 1") {
die "Your system is missing the LWP::Simple Perl module!";
}
@ -31,7 +30,7 @@ BEGIN {
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);
@ -65,7 +64,7 @@ sub parse_url {
return if $url_seen{$src};
$url_seen{$src}++;
my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
my $ua = LWP::UserAgent->new;
my $response = $ua->get($src);
unless ($response->is_success) {
@ -107,7 +106,7 @@ sub parse_url {
}
# hash of installed module versions from our mini-database, key (m_foobar) to version (00abacca..).
my %mod_versions = read_config_file '.modulemanager';
my %mod_versions = read_config_file "$RealDir/.modulemanager";
# useless helper stub
sub getmodversion {
@ -116,7 +115,7 @@ sub getmodversion {
}
# read in external URL sources
open SRC, 'sources.list' or die "Could not open sources.list: $!";
open SRC, "$RealDir/sources.list" or die "Could not open sources.list: $!";
while (<SRC>) {
next if /^\s*#/;
parse_url($_);
@ -310,7 +309,7 @@ print "Processing changes...\n";
for my $mod (keys %installed) {
next if $todo{$mod};
print "Uninstalling $mod $installed{$mod}\n";
unlink "src/modules/$mod.cpp";
unlink "$RealDir/src/modules/$mod.cpp";
}
my $count = scalar keys %todo;
@ -334,7 +333,7 @@ for my $mod (sort keys %todo) {
my $response = $ua->get($url);
if ($response->is_success) {
open(MF, ">src/modules/$mod.cpp") or die "\nFilesystem not writable: $!";
open(MF, '>', "$RealDir/src/modules/$mod.cpp") or die "\nFilesystem not writable: $!";
print MF $response->content;
close(MF);
print " - done\n";
@ -344,6 +343,6 @@ for my $mod (sort keys %todo) {
}
# write database of installed versions
write_config_file '.modulemanager', %mod_versions;
write_config_file "$RealDir/.modulemanager", %mod_versions;
print "Finished!\n";

10
tools/directive
View File

@ -18,15 +18,7 @@
#
BEGIN {
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

6
tools/genssl
View File

@ -19,11 +19,7 @@
#
BEGIN {
require 5.10.0;
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

15
tools/mkdescriptions
View File

@ -18,15 +18,7 @@
#
BEGIN {
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);
@ -42,7 +34,7 @@ use lib dirname $RealDir;
use make::common;
use make::console;
if (scalar @ARGV < 1) {
unless (scalar @ARGV) {
print_format "<|GREEN Usage:|> $0 <<|UNDERLINE DOCS-SITE|>>\n", *STDERR;
exit 1;
}
@ -51,7 +43,8 @@ my %version = get_version();
my $docdir = rel2abs catdir $ARGV[0], 'docs', $version{MAJOR}, 'modules';
print_error "unable to find the module directory at $docdir!" unless -d $docdir;
for my $module (<src/modules/extra/m_*.cpp>, <src/modules/m_*.cpp>, <src/modules/m_*/main.cpp>) {
my $root = dirname $RealDir;
for my $module (<$root/src/modules/extra/m_*.cpp>, <$root/src/modules/m_*.cpp>, <$root/src/modules/m_*/main.cpp>) {
print_error "unable to extract module name from $module!" unless $module =~ /m_(\w+)[.\/]/;
my $docfile = catfile $docdir, "$1.md";
print_error "unable to find the module documentation at $docfile!" unless -f $docfile;

13
tools/mkheaders
View File

@ -18,15 +18,7 @@
#
BEGIN {
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);
@ -49,11 +41,12 @@ my @ignored_revisions = (
'f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f', # peavey fixing line endings
);
my @paths = File::Util->new->list_dir('.' => { recurse => 1 });
my @paths = File::Util->new->list_dir(dirname($RealDir) => { recurse => 1 });
my @updated;
for my $path (@paths) {
next unless -f $path;
next if $path =~ /\/\./;
next if $path =~ /\/build\//;
next if $path =~ /\/vendor\//;
if (system "git ls-files --error-unmatch -- $path 1>/dev/null 2>/dev/null") {

17
tools/test-build
View File

@ -18,15 +18,7 @@
#
BEGIN {
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);
@ -42,6 +34,7 @@ $ENV{INSPIRCD_VERBOSE} = 1;
execute 'git', 'clean', '-dfx';
my $root = dirname $RealDir;
my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
foreach my $compiler (@compilers) {
if (system "$compiler -v > /dev/null 2>&1") {
@ -57,14 +50,14 @@ foreach my $compiler (@compilers) {
say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
my @configure_flags;
if (defined $ENV{TEST_BUILD_MODULES}) {
execute './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES};
execute "$root/configure", '--enable-extras', $ENV{TEST_BUILD_MODULES};
push @configure_flags, '--disable-auto-extras';
}
if (execute './configure', '--development', '--socketengine', $socketengine, @configure_flags) {
if (execute "$root/configure", '--development', '--socketengine', $socketengine, @configure_flags) {
say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}
if (execute 'make', '--jobs', get_cpu_count() + 1, 'install') {
if (execute 'make', '--directory', $root, '--jobs', get_cpu_count() + 1, 'install') {
say "Failed to compile using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}

6
tools/testssl
View File

@ -18,11 +18,7 @@
#
BEGIN {
require 5.10.0;
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);

10
vendor/update vendored
View File

@ -18,15 +18,7 @@
#
BEGIN {
require 5.10.0;
unless (-f 'configure') {
print "Error: $0 must be run from the main source directory!\n";
exit 1;
}
}
use feature ':5.10';
use v5.10.0;
use strict;
use warnings FATAL => qw(all);