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

Various improvements to the build system.

Browse Source 
- Fix running configure where configure is not in the PWD.
- Only show relative paths when generating files from templates.
This commit is contained in:
Sadie Powell 2020-07-07 07:57:32 +01:00
parent 7823761cf3
commit 07b12e7249
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -36,9 +36,10 @@ use feature ':5.10';
use strict; use strict;
use warnings FATAL => qw(all); use warnings FATAL => qw(all);
use Cwd qw(getcwd);
use File::Basename qw(basename); use File::Basename qw(basename);
use File::Copy (); use File::Copy ();
use File::Spec::Functions qw(catfile catdir rel2abs); use File::Spec::Functions qw(abs2rel catfile catdir rel2abs);
use FindBin qw($RealDir); use FindBin qw($RealDir);
use Getopt::Long qw(GetOptions); use Getopt::Long qw(GetOptions);
use POSIX qw(getgid getuid); use POSIX qw(getgid getuid);
@ -351,7 +352,7 @@ Currently, InspIRCd is configured to automatically enable all available extra mo
Would you like to enable extra modules manually? Would you like to enable extra modules manually?
EOQ EOQ
if (prompt_bool $interactive, $question, 0) { if (prompt_bool $interactive, $question, 0) {
foreach my $extra (<src/modules/extra/m_*.cpp>) { foreach my $extra (<$RealDir/src/modules/extra/m_*.cpp>) {
my $module_name = basename $extra, '.cpp'; my $module_name = basename $extra, '.cpp';
if (prompt_bool $interactive, "Would you like to enable $module_name?", 0) { if (prompt_bool $interactive, "Would you like to enable $module_name?", 0) {
enable_extras "$module_name.cpp"; enable_extras "$module_name.cpp";
@ -390,7 +391,7 @@ Note: you can get a <|BOLD free|> CA-signed certificate from Let's Encrypt. See
https://letsencrypt.org/getting-started/ for more details. https://letsencrypt.org/getting-started/ for more details.
EOQ EOQ
if (<src/modules/m_ssl_*.cpp>) { if (<$RealDir/src/modules/m_ssl_*.cpp>) {
if (prompt_bool $interactive, $question, $interactive) { if (prompt_bool $interactive, $question, $interactive) {
system './tools/genssl', 'auto'; system './tools/genssl', 'auto';
} }
@ -426,11 +427,15 @@ Configuration is complete! You have chosen to build with the following settings:
<|GREEN Extra Modules:|> <|GREEN Extra Modules:|>
EOM EOM
for my $file (<src/modules/m_*>) { for my $file (<$RealDir/src/modules/m_*>) {
my $module = basename $file, '.cpp'; my $module = basename $file, '.cpp';
say " * $module" if -l $file; say " * $module" if -l $file;
} }
my @makeargs;
push @makeargs, "-C${\abs2rel $RealDir}" unless getcwd eq $RealDir;
push @makeargs, "-j${\(get_cpu_count() + 1)}";
print_format <<"EOM"; print_format <<"EOM";
<|GREEN Paths:|> <|GREEN Paths:|>
@ -448,7 +453,7 @@ print_format <<"EOM";
<|GREEN Execution User:|> $config{USER} ($config{UID}) <|GREEN Execution User:|> $config{USER} ($config{UID})
<|GREEN Socket Engine:|> $config{SOCKETENGINE} <|GREEN Socket Engine:|> $config{SOCKETENGINE}
To build with these settings run '<|GREEN make -j${\(get_cpu_count() + 1)} install|>' now. To build with these settings run '<|GREEN make ${\join ' ', @makeargs} install|>' now.
EOM EOM

52
make/configure.pm
View File

@ -30,10 +30,9 @@ use feature ':5.10';
use strict; use strict;
use warnings FATAL => qw(all); use warnings FATAL => qw(all);
use Cwd qw(getcwd);
use Exporter qw(import); use Exporter qw(import);
use File::Basename qw(basename dirname); use File::Basename qw(basename dirname);
use File::Spec::Functions qw(catdir catfile); use File::Spec::Functions qw(abs2rel catdir catfile);
use make::common; use make::common;
use make::console; use make::console;
@ -59,7 +58,7 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
sub __get_socketengines { sub __get_socketengines {
my @socketengines; my @socketengines;
foreach (<src/socketengines/socketengine_*.cpp>) { foreach (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) {
s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/; s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
push @socketengines, $1; push @socketengines, $1;
} }
@ -106,7 +105,6 @@ sub cmd_clean {
} }
sub cmd_help { sub cmd_help {
my $PWD = getcwd();
my $SELIST = join ', ', __get_socketengines(); my $SELIST = join ', ', __get_socketengines();
print <<EOH; print <<EOH;
Usage: $0 [options] Usage: $0 [options]
@ -121,29 +119,29 @@ PATH OPTIONS
for system-wide installation. for system-wide installation.
--prefix=[dir] The root install directory. If this is set then --prefix=[dir] The root install directory. If this is set then
all subdirectories will be adjusted accordingly. all subdirectories will be adjusted accordingly.
[$PWD/run] [${\CONFIGURE_ROOT}/run]
--binary-dir=[dir] The location where the main server binary is --binary-dir=[dir] The location where the main server binary is
stored. stored.
[$PWD/run/bin] [${\CONFIGURE_ROOT}/run/bin]
--config-dir=[dir] The location where the configuration files and --config-dir=[dir] The location where the configuration files and
SSL certificates are stored. SSL certificates are stored.
[$PWD/run/conf] [${\CONFIGURE_ROOT}/run/conf]
--data-dir=[dir] The location where the data files, such as the --data-dir=[dir] The location where the data files, such as the
pid file, are stored. pid file, are stored.
[$PWD/run/data] [${\CONFIGURE_ROOT}/run/data]
--example-dir=[dir] The location where the example configuration files --example-dir=[dir] The location where the example configuration files
and SQL schemas are stored. and SQL schemas are stored.
[$PWD/run/conf/examples] [${\CONFIGURE_ROOT}/run/conf/examples]
--log-dir=[dir] The location where the log files are stored. --log-dir=[dir] The location where the log files are stored.
[$PWD/run/logs] [${\CONFIGURE_ROOT}/run/logs]
--manual-dir=[dir] The location where the manual files are stored. --manual-dir=[dir] The location where the manual files are stored.
[$PWD/run/manuals] [${\CONFIGURE_ROOT}/run/manuals]
--module-dir=[dir] The location where the loadable modules are --module-dir=[dir] The location where the loadable modules are
stored. stored.
[$PWD/run/modules] [${\CONFIGURE_ROOT}/run/modules]
--script-dir=[dir] The location where the scripts, such as the --script-dir=[dir] The location where the scripts, such as the
init scripts, are stored. init scripts, are stored.
[$PWD/run] [${\CONFIGURE_ROOT}/run]
EXTRA MODULE OPTIONS EXTRA MODULE OPTIONS
@ -206,9 +204,9 @@ sub test_file($$;$) {
my ($compiler, $file, $args) = @_; my ($compiler, $file, $args) = @_;
my $status = 0; my $status = 0;
$args //= ''; $args //= '';
$status ||= system "$compiler -o __test_$file ${\CONFIGURE_ROOT}/make/test/$file $args ${\CONFIGURE_ERROR_PIPE}"; $status ||= system "$compiler -o ${\CONFIGURE_ROOT}/__test_$file ${\CONFIGURE_ROOT}/make/test/$file $args ${\CONFIGURE_ERROR_PIPE}";
$status ||= system "./__test_$file ${\CONFIGURE_ERROR_PIPE}"; $status ||= system "${\CONFIGURE_ROOT}/__test_$file ${\CONFIGURE_ERROR_PIPE}";
unlink "./__test_$file"; unlink "${\CONFIGURE_ROOT}/__test_$file";
return !$status; return !$status;
} }
@ -223,11 +221,11 @@ sub test_header($$;$) {
sub write_configure_cache(%) { sub write_configure_cache(%) {
unless (-e CONFIGURE_DIRECTORY) { unless (-e CONFIGURE_DIRECTORY) {
print_format "Creating <|GREEN ${\CONFIGURE_DIRECTORY}|> ...\n"; print_format "Creating <|GREEN ${\abs2rel CONFIGURE_DIRECTORY, CONFIGURE_ROOT}|> ...\n";
create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!"; create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
} }
print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n"; print_format "Writing <|GREEN ${\abs2rel CONFIGURE_CACHE_FILE, CONFIGURE_ROOT}|> ...\n";
my %config = @_; my %config = @_;
write_config_file CONFIGURE_CACHE_FILE, %config; write_config_file CONFIGURE_CACHE_FILE, %config;
} }
@ -262,9 +260,9 @@ sub parse_templates($$$) {
my %settings = __get_template_settings($config, $compiler, $version); my %settings = __get_template_settings($config, $compiler, $version);
# Iterate through files in make/template. # Iterate through files in make/template.
foreach (<make/template/*>) { foreach my $template (<${\CONFIGURE_ROOT}/make/template/*>) {
print_format "Parsing <|GREEN $_|> ...\n"; print_format "Parsing <|GREEN ${\abs2rel $template, CONFIGURE_ROOT}|> ...\n";
open(my $fh, $_) or print_error "unable to read $_: $!"; open(my $fh, $template) or print_error "unable to read $template: $!";
my (@lines, $mode, @platforms, @targets); my (@lines, $mode, @platforms, @targets);
# First pass: parse template variables and directives. # First pass: parse template variables and directives.
@ -279,7 +277,7 @@ sub parse_templates($$$) {
} elsif (defined $default) { } elsif (defined $default) {
$line =~ s/\Q$variable\E/$default/; $line =~ s/\Q$variable\E/$default/;
} else { } else {
print_warning "unknown template variable '$name' in $_!"; print_warning "unknown template variable '$name' in $template!";
last; last;
} }
} }
@ -297,9 +295,9 @@ sub parse_templates($$$) {
} elsif ($2 eq 'platform') { } elsif ($2 eq 'platform') {
push @platforms, $3; push @platforms, $3;
} elsif ($2 eq 'target') { } elsif ($2 eq 'target') {
push @targets, $3 push @targets, catfile CONFIGURE_ROOT, $3;
} else { } else {
print_warning "unknown template command '$2' in $_!"; print_warning "unknown template command '$2' in $template!";
push @lines, $line; push @lines, $line;
} }
next; next;
@ -313,7 +311,7 @@ sub parse_templates($$$) {
# Add a default target if the template has not defined one. # Add a default target if the template has not defined one.
unless (@targets) { unless (@targets) {
push @targets, catfile(CONFIGURE_DIRECTORY, basename $_); push @targets, catfile(CONFIGURE_DIRECTORY, basename $template);
} }
# Write the templated files to disk. # Write the templated files to disk.
@ -322,12 +320,12 @@ sub parse_templates($$$) {
# Create the directory if it doesn't already exist. # Create the directory if it doesn't already exist.
my $directory = dirname $target; my $directory = dirname $target;
unless (-e $directory) { unless (-e $directory) {
print_format "Creating <|GREEN $directory|> ...\n"; print_format "Creating <|GREEN ${\abs2rel $directory, CONFIGURE_ROOT}|> ...\n";
create_directory $directory, 0750 or print_error "unable to create $directory: $!"; create_directory $directory, 0750 or print_error "unable to create $directory: $!";
}; };
# Write the template file. # Write the template file.
print_format "Writing <|GREEN $target|> ...\n"; print_format "Writing <|GREEN ${\abs2rel $target, CONFIGURE_ROOT}|> ...\n";
open(my $fh, '>', $target) or print_error "unable to write $target: $!"; open(my $fh, '>', $target) or print_error "unable to write $target: $!";
foreach (@lines) { foreach (@lines) {
say $fh $_; say $fh $_;

2
modulemanager
View File

@ -146,7 +146,7 @@ $modules{core}{$installed{core}} = {
}; };
# set up core module list # set up core module list
for my $modname (<src/modules/m_*.cpp>) { for my $modname (<$RealDir/src/modules/m_*.cpp>) {
my $mod = basename($modname, '.cpp'); my $mod = basename($modname, '.cpp');
my $ver = getmodversion($mod) || '0.0'; my $ver = getmodversion($mod) || '0.0';
$ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN $ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN