X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=a49ad13186f864995e2c5c36e649530b929df3cc;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=cb9b8f640475b4404df0d89f20caa97d5e7c8938;hpb=7af6a054be2f23281d717484e1eb17190043b3e5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index cb9b8f640..a49ad1318 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -1,7 +1,8 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2013-2020 Sadie Powell +# Copyright (C) 2020 Nicole Kleinhoff +# Copyright (C) 2013-2021 Sadie Powell # Copyright (C) 2012 Robby # Copyright (C) 2007-2008 Craig Edwards # Copyright (C) 2007 Dennis Friis @@ -20,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); @@ -45,12 +42,15 @@ use constant CONFIGURE_ERROR_PIPE => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/nu our @EXPORT = qw(CONFIGURE_CACHE_FILE CONFIGURE_CACHE_VERSION + CONFIGURE_DIRECTORY cmd_clean cmd_help cmd_update run_test test_file test_header + module_expand + module_shrink write_configure_cache get_compiler_info find_compiler @@ -58,15 +58,13 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE sub __get_socketengines { my @socketengines; - foreach (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) { + for (<${\CONFIGURE_ROOT}/src/socketengines/socketengine_*.cpp>) { s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/; push @socketengines, $1; } return @socketengines; } -# TODO: when buildtool is done this can be mostly removed with -# the remainder being merged into parse_templates. sub __get_template_settings($$$) { # These are actually hash references @@ -106,76 +104,82 @@ sub cmd_clean { sub cmd_help { my $SELIST = join ', ', __get_socketengines(); - print < <|BOLD $0 [OPTIONS|>] When no options are specified, configure runs in interactive mode and you must specify any required values manually. If one or more options are specified, non-interactive configuration is started and any omitted values are defaulted. -PATH OPTIONS +<|GREEN PATH OPTIONS|> - --system Automatically set up the installation paths - for system-wide installation. - --prefix=[dir] The root install directory. If this is set then + <|BOLD --portable|> Automatically set up the installation paths for + portable installation. + <|BOLD --system|> Automatically set up the installation paths for + system-wide installation. + <|BOLD --prefix |> The root install directory. If this is set then all subdirectories will be adjusted accordingly. [${\CONFIGURE_ROOT}/run] - --binary-dir=[dir] The location where the main server binary is + <|BOLD --binary-dir |> The location where the main server binary is stored. [${\CONFIGURE_ROOT}/run/bin] - --config-dir=[dir] The location where the configuration files and + <|BOLD --config-dir |> The location where the configuration files and SSL certificates are stored. [${\CONFIGURE_ROOT}/run/conf] - --data-dir=[dir] The location where the data files, such as the - pid file, are stored. + <|BOLD --data-dir |> The location where the data files, such as the + xline database, are stored. [${\CONFIGURE_ROOT}/run/data] - --example-dir=[dir] The location where the example configuration files - and SQL schemas are stored. + <|BOLD --example-dir |> The location where the example configuration + files and SQL schemas are stored. [${\CONFIGURE_ROOT}/run/conf/examples] - --log-dir=[dir] The location where the log files are stored. + <|BOLD --log-dir |> The location where the log files are stored. [${\CONFIGURE_ROOT}/run/logs] - --manual-dir=[dir] The location where the manual files are stored. + <|BOLD --manual-dir |> The location where the manual files are stored. [${\CONFIGURE_ROOT}/run/manuals] - --module-dir=[dir] The location where the loadable modules are + <|BOLD --module-dir |> The location where the loadable modules are stored. [${\CONFIGURE_ROOT}/run/modules] - --script-dir=[dir] The location where the scripts, such as the + <|BOLD --runtime-dir |> The location where the runtime files, such as + the pid file, are stored. + [${\CONFIGURE_ROOT}/run/data] + <|BOLD --script-dir |> The location where the scripts, such as the init scripts, are stored. [${\CONFIGURE_ROOT}/run] -EXTRA MODULE OPTIONS +<|GREEN EXTRA MODULE OPTIONS|> - --enable-extras=[extras] Enables a comma separated list of extra modules. - --disable-extras=[extras] Disables a comma separated list of extra modules. - --list-extras Shows the availability status of all extra + <|BOLD --enable-extras |> Enables a comma separated list of extra modules. + <|BOLD --disable-extras |> Disables a comma separated list of extra modules. + <|BOLD --list-extras|> Shows the availability status of all extra modules. -MISC OPTIONS +<|GREEN MISC OPTIONS|> - --clean Remove the configuration cache file and start + <|BOLD --clean|> Remove the configuration cache file and start the interactive configuration wizard. - --disable-auto-extras Disables automatically enabling extra modules + <|BOLD --disable-auto-extras|> Disables automatically enabling extra modules for which the dependencies are available. - --disable-interactive Disables the interactive configuration wizard. - --distribution-label=[text] Sets a distribution specific version label in + <|BOLD --disable-interactive|> Disables the interactive configuration wizard. + <|BOLD --distribution-label |> Sets a distribution specific version label in the build configuration. - --gid=[id|name] Sets the group to run InspIRCd as. - --help Show this message and exit. - --socketengine=[name] Sets the socket engine to be used. Possible + <|BOLD --gid |> Sets the group to run InspIRCd as. + <|BOLD --help|> Show this message and exit. + <|BOLD --socketengine |> Sets the socket engine to be used. Possible values are $SELIST. - --uid=[id|name] Sets the user to run InspIRCd as. - --update Updates the build environment with the settings + <|BOLD --uid [ID|NAME]|> Sets the user to run InspIRCd as. + <|BOLD --update|> Updates the build environment with the settings from the cache. +<|GREEN FLAGS|> -FLAGS - - CXX=[name] Sets the C++ compiler to use when building the + <|BOLD CXX=|> Sets the C++ compiler to use when building the server. If not specified then the build system will search for c++, g++, clang++ or icpc. + <|BOLD INSPIRCD_VERBOSE=<0|1>|> Shows additional information for debugging. If you have any problems with configuring InspIRCd then visit our IRC channel -at irc.inspircd.org #InspIRCd for support. +at irc.inspircd.org #InspIRCd or create a support discussion at +https://github.com/inspircd/inspircd/discussions. Packagers: see https://docs.inspircd.org/packaging/ for packaging advice. EOH @@ -186,6 +190,8 @@ sub cmd_update { print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f CONFIGURE_CACHE_FILE; say 'Updating...'; my %config = read_config_file(CONFIGURE_CACHE_FILE); + $config{EXAMPLE_DIR} //= catdir $config{CONFIG_DIR}, 'examples'; + $config{RUNTIME_DIR} //= $config{DATA_DIR}; my %compiler = get_compiler_info($config{CXX}); my %version = get_version $config{DISTRIBUTION}; parse_templates(\%config, \%compiler, \%version); @@ -196,8 +202,8 @@ sub cmd_update { sub run_test($$;$) { my ($what, $result, $adjective) = @_; $adjective //= 'available'; - print_format "Checking whether <|GREEN $what|> is $adjective ... "; - print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n"; + print console_format "Checking whether <|GREEN $what|> is $adjective ... "; + say console_format($result ? "<|GREEN yes|>" : "<|RED no|>"); return $result; } @@ -220,13 +226,26 @@ sub test_header($$;$) { return !$?; } +sub module_expand($) { + my $module = shift; + $module = "m_$module" unless $module =~ /^(?:m|core)_/; + $module = "$module.cpp" unless $module =~ /\.cpp$/; + return $module; +} + +sub module_shrink($) { + my $module = basename shift; + $module =~ s/(?:^m_|\.cpp$)//g; + return $module; +} + sub write_configure_cache(%) { unless (-e CONFIGURE_DIRECTORY) { - print_format "Creating <|GREEN ${\abs2rel CONFIGURE_DIRECTORY, CONFIGURE_ROOT}|> ...\n"; + say console_format "Creating <|GREEN ${\abs2rel CONFIGURE_DIRECTORY, CONFIGURE_ROOT}|> ..."; create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!"; } - print_format "Writing <|GREEN ${\abs2rel CONFIGURE_CACHE_FILE, CONFIGURE_ROOT}|> ...\n"; + say console_format "Writing <|GREEN ${\abs2rel CONFIGURE_CACHE_FILE, CONFIGURE_ROOT}|> ..."; my %config = @_; write_config_file CONFIGURE_CACHE_FILE, %config; } @@ -246,7 +265,7 @@ sub get_compiler_info($) { sub find_compiler { my @compilers = qw(c++ g++ clang++ icpc); - foreach my $compiler (shift // @compilers) { + for my $compiler (shift // @compilers) { return $compiler if __test_compiler $compiler; return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler"; } @@ -261,8 +280,8 @@ sub parse_templates($$$) { my %settings = __get_template_settings($config, $compiler, $version); # Iterate through files in make/template. - foreach my $template (<${\CONFIGURE_ROOT}/make/template/*>) { - print_format "Parsing <|GREEN ${\abs2rel $template, CONFIGURE_ROOT}|> ...\n"; + for my $template (<${\CONFIGURE_ROOT}/make/template/*>) { + say console_format "Parsing <|GREEN ${\abs2rel $template, CONFIGURE_ROOT}|> ..."; open(my $fh, $template) or print_error "unable to read $template: $!"; my (@lines, $mode, @platforms, @targets); @@ -321,14 +340,14 @@ sub parse_templates($$$) { # Create the directory if it doesn't already exist. my $directory = dirname $target; unless (-e $directory) { - print_format "Creating <|GREEN ${\abs2rel $directory, CONFIGURE_ROOT}|> ...\n"; + say console_format "Creating <|GREEN ${\abs2rel $directory, CONFIGURE_ROOT}|> ..."; create_directory $directory, 0750 or print_error "unable to create $directory: $!"; }; # Write the template file. - print_format "Writing <|GREEN ${\abs2rel $target, CONFIGURE_ROOT}|> ...\n"; + say console_format "Writing <|GREEN ${\abs2rel $target, CONFIGURE_ROOT}|> ..."; open(my $fh, '>', $target) or print_error "unable to write $target: $!"; - foreach (@lines) { + for (@lines) { say $fh $_; } close $fh;