###################################################
# InspIRCd Configuration Script
#
-# Copyright 2002-2007 The InspIRCd Development Team
+# Copyright 2002-2008 The InspIRCd Development Team
# http://www.inspircd.org/wiki/index.php/Credits
#
# Licensed under GPL, please see the COPYING file
#
###################################################
-require 5.8.0;
+BEGIN {
+ require 5.8.0;
+}
use strict;
use warnings FATAL => qw(all);
$Data::Dumper::Useqq = 1;
};
+use File::Copy ();
+
use Socket;
use Cwd;
use Getopt::Long;
# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
# whos file extension is omitted (these can vary from system to system). Auto detected by
-# scanning the src/*.cpp files for files containing /* $Core: */ identifiers.
+# scanning the src/*.cpp files for files containing /* $Core */ identifiers.
our %filelist = ();
our %extrasources = ();
-our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_nick_length,
- $opt_chan_length, $opt_maxclients, $opt_ports, $opt_epoll, $opt_kqueue, $opt_noports,
- $opt_noepoll, $opt_nokqueue, $opt_disablerpath, $opt_ipv6, $opt_ipv6links,
- $opt_noipv6links, $opt_ident, $opt_quit, $opt_topic, $opt_maxbuf, $opt_kick,
- $opt_gecos, $opt_away, $opt_modes, $opt_disable_debug, $opt_maxchans,
- $opt_opermaxchans);
+our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports,
+ $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue,
+ $opt_ipv6, $opt_ipv6links, $opt_noipv6links, $opt_maxbuf, $opt_disable_debug,
+ $opt_freebsd_port);
our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir,
$opt_library_dir);
+sub list_extras ();
+
+sub enable_extras (@);
+
+sub disable_extras (@);
+
+my @opt_enableextras;
+my @opt_disableextras;
+
GetOptions (
'enable-gnutls' => \$opt_use_gnutls,
'rebuild' => \$opt_rebuild,
'enable-openssl' => \$opt_use_openssl,
'disable-interactive' => \$opt_nointeractive,
- 'with-nick-length=i' => \$opt_nick_length,
- 'with-channel-length=i' => \$opt_chan_length,
- 'with-max-clients=i' => \$opt_maxclients,
'enable-ports' => \$opt_ports,
'enable-epoll' => \$opt_epoll,
'enable-kqueue' => \$opt_kqueue,
'disable-ports' => \$opt_noports,
'disable-epoll' => \$opt_noepoll,
'disable-kqueue' => \$opt_nokqueue,
- 'disable-rpath' => \$opt_disablerpath,
'enable-ipv6' => \$opt_ipv6,
'enable-remote-ipv6' => \$opt_ipv6links,
'disable-remote-ipv6' => \$opt_noipv6links,
'with-cc=s' => \$opt_cc,
- 'with-ident-length=i' => \$opt_ident,
- 'with-quit-length=i' => \$opt_quit,
- 'with-topic-length=i' => \$opt_topic,
'with-maxbuf=i' => \$opt_maxbuf,
- 'with-kick-length=i' => \$opt_kick,
- 'with-gecos-length=i' => \$opt_gecos,
- 'with-away-length=i' => \$opt_away,
- 'with-max-modes=i' => \$opt_modes,
+ 'enable-freebsd-ports-openssl' => \$opt_freebsd_port,
'prefix=s' => \$opt_base_dir,
'config-dir=s' => \$opt_config_dir,
'module-dir=s' => \$opt_module_dir,
'update' => sub { update(); },
'svnupdate' => sub { svnupdate(); },
'clean' => sub { clean(); },
+ 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing.
+ 'enable-extras=s@' => \@opt_enableextras, # ^
+ 'disable-extras=s@' => \@opt_disableextras, # ^
);
+if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
+ @opt_enableextras = split /,/, join(',', @opt_enableextras);
+ @opt_disableextras = split /,/, join(',', @opt_disableextras);
+ enable_extras(@opt_enableextras);
+ disable_extras(@opt_disableextras);
+ list_extras;
+ print "Remember: YOU are responsible for making sure any libraries needed have been installed!\n";
+ print "Run $0 -modupdate after you've done this to update the makefiles.\n";
+ exit 0;
+}
+
our $non_interactive = (
(defined $opt_library_dir) ||
(defined $opt_base_dir) ||
(defined $opt_base_dir) ||
(defined $opt_binary_dir) ||
(defined $opt_nointeractive) ||
- (defined $opt_away) ||
- (defined $opt_gecos) ||
- (defined $opt_kick) ||
- (defined $opt_maxclients) ||
- (defined $opt_modes) ||
- (defined $opt_topic) ||
- (defined $opt_quit) ||
- (defined $opt_ident) ||
(defined $opt_cc) ||
(defined $opt_ipv6) ||
(defined $opt_ipv6links) ||
(defined $opt_kqueue) ||
(defined $opt_epoll) ||
(defined $opt_ports) ||
- (defined $opt_maxchans) ||
- (defined $opt_opermaxchans) ||
- (defined $opt_chan_length) ||
- (defined $opt_nick_length) ||
(defined $opt_use_openssl) ||
(defined $opt_nokqueue) ||
(defined $opt_noepoll) ||
(defined $opt_noports) ||
(defined $opt_maxbuf) ||
- (defined $opt_use_gnutls)
+ (defined $opt_use_gnutls) ||
+ (defined $opt_freebsd_port)
);
our $interactive = !$non_interactive;
$config{LIBRARY_DIR} = $opt_library_dir;
}
chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
-chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version
+
+if (defined $opt_freebsd_port)
+{
+ chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`);
+ chomp($config{HAS_OPENSSL_PORT} = `pkg-config --modversion openssl 2>/dev/null`);
+ $config{USE_FREEBSD_BASE_SSL} = "n";
+}
+else
+{
+ if ($^O eq "freebsd")
+ {
+ # default: use base ssl
+ chomp($config{HAS_OPENSSL} = `openssl version | cut -d ' ' -f 2`); # OpenSSL version, freebsd specific
+ chomp($config{HAS_OPENSSL_PORT} = `pkg-config --modversion openssl 2>/dev/null`); # Port version, may be different
+ }
+ else
+ {
+ chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version, others
+ $config{HAS_OPENSSL_PORT} = "";
+ }
+}
+
chomp(our $gnutls_ver = $config{HAS_GNUTLS});
chomp(our $openssl_ver = $config{HAS_OPENSSL});
$config{USE_GNUTLS} = "n";
$config{OPTIMISATI} = "-O2"; # DEBUGGING OFF!
}
-$config{NICK_LENGT} = "31"; # Default Nick Length
-if (defined $opt_nick_length)
-{
- $config{NICK_LENGT} = $opt_nick_length;
-}
-$config{CHAN_LENGT} = "64"; # Default Channel Name Length
-if (defined $opt_chan_length)
-{
- $config{CHAN_LENGT} = $opt_chan_length;
-}
-$config{MAXI_MODES} = "20"; # Default Max. Number of Modes set at once.
-if (defined $opt_modes)
-{
- $config{MAXI_MODES} = $opt_modes;
-}
$config{HAS_STRLCPY} = "false"; # strlcpy Check.
$config{HAS_STDINT} = "false"; # stdint.h check
$config{USE_KQUEUE} = "y"; # kqueue enabled
{
$config{SUPPORT_IP6LINKS} = "n";
}
-chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`); # FD Limit
-chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`); # Hard FD Limit
chomp($config{GCCVER} = `g++ -dumpversion | cut -c 1`); # Major GCC Version
+chomp($config{GCCMINOR} = `g++ -dumpversion | cut -c 3`);
$config{_SOMAXCONN} = SOMAXCONN; # Max connections in accept queue
$config{OSNAME} = $^O; # Operating System Name
$config{IS_DARWIN} = "NO"; # Is OSX?
}
our $exec = $config{CC} . " -dumpversion | cut -c 1";
chomp($config{GCCVER} = `$exec`); # Major GCC Version
+$exec = $config{CC} . " -dumpversion | cut -c 3";
+chomp($config{GCCMINOR} = `$exec`);
$config{MAKEORDER} = "ircd mods"; # build order
-$config{MAX_IDENT} = "12"; # max ident size
-$config{MAX_QUIT} = "255"; # max quit message size
-$config{MAX_TOPIC} = "307"; # max topic size
-$config{MAX_KICK} = "255"; # max kick message size
-$config{MAX_GECOS} = "128"; # max GECOS size
-$config{MAX_AWAY} = "200"; # max AWAY size
$config{MAXBUF} = "512"; # Max buffer size
-if (defined $opt_ident)
-{
- $config{MAX_IDENT} = $opt_ident;
-}
-if (defined $opt_quit)
-{
- $config{MAX_QUIT} = $opt_quit;
-}
-if (defined $opt_topic)
-{
- $config{MAX_TOPIC} = $opt_topic;
-}
-if (defined $opt_kick)
-{
- $config{MAX_KICK} = $opt_kick;
-}
-if (defined $opt_gecos)
-{
- $config{MAX_GECOS} = $opt_gecos;
-}
-if (defined $opt_away)
-{
- $config{MAX_AWAY} = $opt_away;
-}
-$config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/;
-$config{HAS_OPENSSL} = $1;
+if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) {
+ $config{HAS_OPENSSL} = $1;
+} else {
+ $config{HAS_OPENSSL} = "";
+}
-if ($config{GCCVER} eq "") {
+if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
exit;
}
-our $fd_scan_fail = "";
-if (!$config{MAX_CLIENT_T}) {
- $config{MAX_CLIENT_T} = 1024; # Set a reasonable 'Default'
- $fd_scan_fail = "true"; # Used Later
-}
-
# Get and Set some important vars..
getmodules();
open(FH,"<.svn/entries") or $fail = 1;
if ($fail) {
print "This is not an SVN copy of InspIRCd.\n";
- exit;
+ exit 1;
}
else
{
close(FH);
}
- system("svn update");
- system("perl configure -update");
+ open my $fd, "-|", "svn update";
+ my $configurechanged = 0; # Needs ./configure -update
+ my $coredirchanged = 0; # Needs ./configure -update
+ my $moduledirchanged = 0; # Needs ./configure -modupdate
+ my $rootincchanged = 0;
+ my @conflicted = ();
+ while (defined(my $line = <$fd>))
+ {
+ my ($action, $file);
+ print $line;
+ $line =~ m/^([ADUCG])\s+(.*)$/ or next;
+ ($action, $file) = ($1, $2);
+ if ($action eq "C")
+ {
+ push @conflicted, $file;
+ if ($file eq "configure")
+ {
+ $configurechanged = 1;
+ }
+ elsif ($file =~ m#^src/modules#)
+ {
+ $moduledirchanged = 1;
+ }
+ elsif ($file =~ m#^src/#)
+ {
+ $coredirchanged = 1;
+ }
+ elsif ($file =~ m/^\..*\.inc$/)
+ {
+ $rootincchanged = 1;
+ }
+ }
+ elsif ($action eq "U" || $action eq "G")
+ {
+ if ($file eq "configure")
+ {
+ $configurechanged = 1;
+ }
+ elsif ($file =~ m/^\..*\.inc$/)
+ {
+ $rootincchanged = 1;
+ }
+ }
+ elsif ($action eq "A" || $action eq "D")
+ {
+ if ($file =~ m#^src/modules#)
+ {
+ $moduledirchanged = 1;
+ }
+ elsif ($file =~ m#^src/#)
+ {
+ $coredirchanged = 1;
+ }
+ }
+ }
+ unless (close $fd) # close() waits for exit and returns false if the command failed
+ {
+ if ($! == 0)
+ {
+ print STDERR "Problem updating from SVN, please check above for errors\n";
+ }
+ else
+ {
+ print STDERR "Failed to run SVN: $!\n";
+ }
+ exit 1;
+ }
+ if (scalar(@conflicted) > 0)
+ {
+ print STDERR "\e[0;33;1mERROR:\e[0m You have local modifications which conflicted with the updates from SVN\n";
+ printf STDERR "Configure is not able to complete the update. Please resolve these conflicts, then run ./configure -%supdate\n", (($coredirchanged || $configurechanged) ? "" : "mod");
+ print "Conflicted files: " . join ", ", @conflicted . "\n";
+ exit 1;
+ }
+ if ($configurechanged || $coredirchanged)
+ {
+ system("perl configure -update");
+ }
+ elsif ($moduledirchanged || $rootincchanged)
+ {
+ system("perl configure -modupdate");
+ }
+ else
+ {
+ print "No need to update Makefiles.\n";
+ }
if (defined $opt_rebuild) {
system("make install");
}
print "Checking operating system version... ";
print getosflags() . "\n";
-if (defined $opt_maxclients)
-{
- $config{MAX_CLIENT} = $opt_maxclients;
-}
-
-if (!$config{MAX_CLIENT}) {
- # If the cache hasn't set the max clients, copy the variable of MAX_CLIENT_T, this
- # allows us to keep _T for testing purposes. (ie. "Are you sure you want to go
- # higher than the found value" :))
- $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
-}
-
printf "Checking if stdint.h exists... ";
$config{HAS_STDINT} = "true";
our $fail = 0;
$fail = 0;
open(KQUEUE, "</usr/include/sys/event.h") or $fail = 1;
if (!$fail) {
- while (defiined(my $line = <KQUEUE>)) {
+ while (defined(my $line = <KQUEUE>)) {
chomp($line);
# try and find the delcaration of:
# int kqueue(void);
$config{HAS_KQUEUE} = $has_kqueue;
printf "Checking for libgnutls... ";
-if (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y")) {
- print "yes\n";
- $config{HAS_GNUTLS} = "y";
+if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
+ if (defined($gnutls_ver) && ($gnutls_ver ne "")) {
+ print "yes\n";
+ $config{HAS_GNUTLS} = "y";
+ } else {
+ print "no\n";
+ $config{HAS_GNUTLS} = "n";
+ }
} else {
print "no\n";
$config{HAS_GNUTLS} = "n";
}
printf "Checking for openssl... ";
-if (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y")) {
- print "yes\n";
- $config{HAS_OPENSSL} = "y";
+if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) {
+ if (defined($openssl_ver) && ($openssl_ver ne "")) {
+ print "yes\n";
+ $config{HAS_OPENSSL} = "y";
+ } else {
+ print "no\n";
+ $config{HAS_OPENSSL} = "n";
+ }
} else {
print "no\n";
$config{HAS_OPENSSL} = "n";
# Clear the Screen..
if ($interactive)
{
- system("clear");
+ print "\e[2J\e[0G\e[0d"; # J = Erase in Display, 2 = Entire Screen, (G, d) = Move cursor to (..,..)
my $wholeos = $^O;
my $rev = getrevision();
# Display Introduction Message..
- print "
-Welcome to the \033[1mInspIRCd\033[0m Configuration program! (\033[1minteractive mode\033[0m)
-\033[1mPackage maintainers: Type ./configure --help for non-interactive help\033[0m
+ print <<"STOP" ;
+Welcome to the \e[1mInspIRCd\e[0m Configuration program! (\e[1minteractive mode\e[0m)
+\e[1mPackage maintainers: Type ./configure --help for non-interactive help\e[0m
*** If you are unsure of any of these values, leave it blank for ***
*** standard settings that will work, and your server will run ***
*** using them. Please consult your IRC network admin if in doubt. ***
-Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter
-a new value. Please note: You will \033[1mHAVE\033[0m to read the docs
+Press \e[1m<RETURN>\e[0m to accept the default for any option, or enter
+a new value. Please note: You will \e[1mHAVE\e[0m to read the docs
dir, otherwise you won't have a config file!
-Your operating system is: \033[1;32m$config{OSNAME}\033[0m ($wholeos)
-Maximum file descriptors: \033[1;32m$config{MAX_CLIENT_T}\033[0m
-Your InspIRCd revision ID is \033[1;32mr$rev\033[0m";
+Your operating system is: \e[1;32m$config{OSNAME}\e[0m ($wholeos)
+Your InspIRCd revision ID is \e[1;32mr$rev\e[0m
+STOP
if ($rev eq "r0") {
print " (Non-SVN build)";
}
print ".\n\n";
$config{CHANGE_COMPILER} = "n";
- print "I have detected the following compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
+ print "I have detected the following compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n";
while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) {
- print "\033[1;32mIMPORTANT!\033[0m A GCC 2.x compiler has been detected, and
+ print "\e[1;32mIMPORTANT!\e[0m A GCC 2.x compiler has been detected, and
should NOT be used. You should probably specify a newer compiler.\n\n";
yesno('CHANGE_COMPILER',"Do you want to change the compiler?");
if ($config{CHANGE_COMPILER} =~ /y/i) {
print "What command do you want to use to invoke your compiler?\n";
- print "[\033[1;32m$config{CC}\033[0m] -> ";
+ print "[\e[1;32m$config{CC}\e[0m] -> ";
chomp($config{CC} = <STDIN>);
if ($config{CC} eq "") {
$config{CC} = "g++";
chomp(my $foo = `$config{CC} -dumpversion | cut -c 1`);
if ($foo ne "") {
chomp($config{GCCVER} = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers
- print "Queried compiler: \033[1;32m$config{CC}\033[0m (version \033[1;32m$config{GCCVER}.x\033[0m)\n";
+ chomp($config{GCCMINOR} = `$config{CC} -dumpversion | cut -c 3`);
+ print "Queried compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n";
if ($config{GCCVER} < 3) {
- print "\033[1;32mGCC 2.x WILL NOT WORK!\033[0m. Let's try that again, shall we?\n";
+ print "\e[1;32mGCC 2.x WILL NOT WORK!\e[0m. Let's try that again, shall we?\n";
}
}
else {
- print "\033[1;32mWARNING!\033[0m Could not execute the compiler you specified. You may want to try again.\n";
+ print "\e[1;32mWARNING!\e[0m Could not execute the compiler you specified. You may want to try again.\n";
}
}
}
print "\n";
if ($config{IPV6} eq "y") {
- print "You have chosen to build an \033[1;32mIPV6-enabled\033[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
+ print "You have chosen to build an \e[1;32mIPV6-enabled\e[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n";
$config{SUPPORT_IP6LINKS} = "y";
} else {
- yesno('SUPPORT_IP6LINKS',"You have chosen to build an \033[1;32mIPV4-only\033[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)");
+ yesno('SUPPORT_IP6LINKS',"You have chosen to build an \e[1;32mIPV4-only\e[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers? If you are using a recent operating system and are\nunsure, answer yes. If you answer 'no' here, your InspIRCd server will\nbe unable to parse IPV6 addresses (e.g. for CIDR bans)\n\nEnable linking to servers which have IPV6 enabled?");
+ print "\n";
+ }
+
+ $config{USE_FREEBSD_BASE_SSL} = "n";
+ $config{USE_FREEBSD_PORTS_SSL} = "n";
+ if ($config{HAS_OPENSSL_PORT} ne "")
+ {
+ $config{USE_FREEBSD_PORTS_SSL} = "y";
+ print "I have detected the OpenSSL FreeBSD port installed on your system,\n";
+ print "version \e[1;32m".$config{HAS_OPENSSL_PORT}."\e[0m. Your base system OpenSSL is version \e[1;32m".$openssl_ver."\e[0m.\n\n";
+ yesno('USE_FREEBSD_PORTS_SSL', "Do you want to use the FreeBSD ports version?");
print "\n";
+ $config{USE_FREEBSD_BASE_SSL} = "y" if ($config{USE_FREEBSD_PORTS_SSL} eq "n");
+
+ if ($config{USE_FREEBSD_BASE_SSL} eq "n")
+ {
+ # update to port version
+ $openssl_ver = $config{HAS_OPENSSL_PORT};
+ }
+ }
+ else
+ {
+ $config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd");
}
if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) {
- print "I have detected both \033[1;32mGnuTLS\033[0m and \033[1;32mOpenSSL\033[0m on your system.\n";
+ print "I have detected both \e[1;32mGnuTLS\e[0m and \e[1;32mOpenSSL\e[0m on your system.\n";
print "I will default to GnuTLS. If you wish to use OpenSSL\n";
print "instead, you should enable the OpenSSL module yourself\n";
print "by copying it from src/modules/extra to src/modules.\n\n";
- print "Detected GnuTLS version: \033[1;32m" . $gnutls_ver . "\033[0m\n";
- print "Detected OpenSSL version: \033[1;32m" . $openssl_ver . "\033[0m\n\n";
+ print "Detected GnuTLS version: \e[1;32m" . $gnutls_ver . "\e[0m\n";
+ print "Detected OpenSSL version: \e[1;32m" . $openssl_ver . "\e[0m\n\n";
}
if ($config{HAS_GNUTLS} eq "y") {
else {
print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n";
}
-
- print "\nThe following questions will ask you for various figures relating\n";
- print "To your IRCd install. Please note that these should usually be left\n";
- print "as defaults unless you have a real reason to change them. If they\n";
- print "changed, then the values must be identical on all servers on your\n";
- print "network, or malfunctions and/or crashes may occur, with the exception\n";
- print "of the 'maximum number of clients' setting which may be different on\n";
- print "different servers on the network.\n\n";
-
- # File Descriptor Settings..
- promptnumeric("number of clients at any one time", "MAX_CLIENT_T");
- $config{MAX_CLIENT} = $config{MAX_CLIENT_T};
- $config{MAX_DESCRIPTORS} = $config{MAX_CLIENT_T};
-
- promptnumeric("length of nicknames", "NICK_LENGT");
- promptnumeric("length of channel names", "CHAN_LENGT");
- promptnumeric("number of mode changes in one line", "MAXI_MODES");
- promptnumeric("length of an ident (username)", "MAX_IDENT");
- promptnumeric("length of a quit message", "MAX_QUIT");
- promptnumeric("length of a channel topic", "MAX_TOPIC");
- promptnumeric("length of a kick message", "MAX_KICK");
- promptnumeric("length of a GECOS (real name)", "MAX_GECOS");
- promptnumeric("length of an away message", "MAX_AWAY");
}
dumphash();
our $failed = 0;
if ($config{USE_GNUTLS} eq "y") {
- $failed = 0;
- open(TMP, "<src/modules/m_ssl_gnutls.cpp") or $failed = 1;
- close(TMP);
- if ($failed) {
+ unless (-r "src/modules/m_ssl_gnutls.cpp") {
print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
- chdir("src/modules");
- system("ln -s extra/m_ssl_gnutls.cpp");
- chdir("../..");
+ symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!";
}
getmodules();
if ($interactive)
{
- $failed = 0;
- open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
- close(TMP);
- open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
- close(TMP);
- if ($failed) {
+ unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
*************************************************************
* Generating the Private Key may take some time, go grab a *
*************************************************************\n\n";
$failed = make_gnutls_cert();
if ($failed) {
- print "\n\033[1;32mCertificate generation failed!\033[0m\n\n";
+ print "\n\e[1;32mCertificate generation failed!\e[0m\n\n";
} else {
print "\nCertificate generation complete, copying to config directory... ";
- system("mv key.pem $config{CONFIG_DIR}/key.pem");
- system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
+ File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n";
+ File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n";
print "Done.\n\n";
}
}
print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
}
} elsif ($config{USE_OPENSSL} eq "y") {
- $failed = 0;
- open(TMP, "<src/modules/m_ssl_openssl.cpp") or $failed = 1;
- close(TMP);
- if ($failed) {
+ unless (-r "src/modules/m_ssl_openssl.cpp") {
print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
- chdir("src/modules");
- system("ln -s extra/m_ssl_openssl.cpp");
- chdir("../..");
+ symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!";
}
getmodules();
$failed = 0;
if ($interactive)
{
- open(TMP, "<$config{CONFIG_DIR}/key.pem") or $failed = 1;
- close(TMP);
- open(TMP, "<$config{CONFIG_DIR}/cert.pem") or $failed = 1;
- close(TMP);
- if ($failed) {
+ unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
*************************************************************
* Generating the certificates may take some time, go grab a *
*************************************************************\n\n";
make_openssl_cert();
print "\nCertificate generation complete, copying to config directory... ";
- system("mv key.pem $config{CONFIG_DIR}/key.pem");
- system("mv cert.pem $config{CONFIG_DIR}/cert.pem");
- system("mv dhparams.pem $config{CONFIG_DIR}/dhparams.pem");
+ File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n";
+ File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n";
+ File::Copy::move("dhparams.pem", "$config{CONFIG_DIR}/dhparams.pem") or print STDERR "Could not copy dhparams.pem!\n";
print "Done.\n\n";
} else {
print "SSL Certificates found, skipping.\n\n"
makecache();
print "\n\n";
-print "To build your server with these settings, please type '\033[1;32m$config{MAKEPROG}\033[0m' now.\n";
+print "To build your server with these settings, please type '\e[1;32m$config{MAKEPROG}\e[0m' now.\n";
if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
- print "Please remember that to enable \033[1;32mSSL support\033[0m you must\n";
- print "load the required modules in your config. This configure process\n";
- print "has just prepared these modules to be compiled for you, and has not\n";
- print "configured them to be compiled into the core of the ircd.\n";
+ print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n";
+ print "modules in your config. This configure script has added those modules to the\n";
+ print "build process. For more info please refer to:\n";
+ print "\e[1;32mhttp://www.inspircd.org/wiki/Installation_From_Tarball\e[0m\n";
}
-print "*** \033[1;32mRemember to edit your configuration files!!!\033[0m ***\n\n\n";
+print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n\n";
if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) {
- print "\033[1;32mWARNING!\033[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but i'm letting you\ngo ahead with it anyway, just in case i'm wrong :-)\n";
+ print "\e[1;32mWARNING!\e[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but i'm letting you\ngo ahead with it anyway, just in case i'm wrong :-)\n";
}
if ($config{GCCVER} < "3") {
print <<FOO2;
-\033[1;32mWARNING!\033[0m You are attempting to compile InspIRCd on GCC 2.x!
+\e[1;32mWARNING!\e[0m You are attempting to compile InspIRCd on GCC 2.x!
GCC 2.x series compilers only had partial (read as broken) C++ support, and
your compile will most likely fail horribly! If you have any problems, do NOT
report them to the bugtracker or forums without first upgrading your compiler
sub makecache {
# Dump the contents of %config
- print "Writing \033[1;32mcache file\033[0m for future ./configures ...\n";
+ print "Writing \e[1;32mcache file\e[0m for future ./configures ...\n";
open(FILEHANDLE, ">.config.cache");
foreach my $key (keys %config) {
print FILEHANDLE "$key=\"$config{$key}\"\n";
my $complete = 0;
while (!$complete) {
print "In what directory $desc?\n";
- print "[\033[1;32m$config{$hash_key}\033[0m] -> ";
+ print "[\e[1;32m$config{$hash_key}\e[0m] -> ";
chomp(my $var = <STDIN>);
if ($var eq "") {
$var = $config{$hash_key};
$var = resolve_directory($var);
if (! -e $var) {
- print "$var does not exist. Create it?\n[\033[1;32my\033[0m] ";
+ print "$var does not exist. Create it?\n[\e[1;32my\e[0m] ";
chomp(my $tmp = <STDIN>);
if (($tmp eq "") || ($tmp =~ /^y/i)) {
# Attempt to Create the Dir..
-
- system("mkdir -p \"$var\" >> /dev/null 2>&1");
- my $chk = system("mkdir -p \"$var\" >> /dev/null 2>&1") / 256;
- if ($chk != 0) {
+ my $chk = eval {
+ use File::Path ();
+ File::Path::mkpath($var, 0, 0777);
+ 1;
+ };
+ unless (defined($chk) && -d $var) {
print "Unable to create directory. ($var)\n\n";
# Restart Loop..
next;
sub getosflags {
- $config{LDLIBS} = "-lstdc++";
- $config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
- $config{DEVELOPER} = "-fPIC -Wall -pedantic -g";
- $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath;
+ # Beware: Linux sets it's own cflags below for some retarded reason
+ $config{LDLIBS} = "-pthread -lstdc++";
+ $config{FLAGS} = "-fPIC -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall $config{OPTIMISATI}";
+ $config{DEVELOPER} = "-fPIC -Woverloaded-virtual -Wshadow -Wall -Wformat=2 -Wmissing-format-attribute -g";
+ $SHARED = "-shared";
$config{MAKEPROG} = "make";
if ($config{OSNAME} =~ /darwin/i) {
- $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall -pedantic $config{OPTIMISATI}";
+ $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall $config{OPTIMISATI}";
$SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
- $config{LDLIBS} = "-ldl -lstdc++";
+ $config{LDLIBS} = "-ldl -pthread -lstdc++";
}
if ($config{OSNAME} =~ /OpenBSD/i) {
if ($foo ne "") {
$config{CC} = "eg++";
chomp($config{GCCVER} = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path
+ chomp($config{GCCMINOR} = `eg++ -dumpversion | cut -c 3`);
}
return "OpenBSD";
}
if ($config{OSNAME} =~ /Linux/i) {
- $config{LDLIBS} = "-ldl -lstdc++";
- $config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
+ $config{LDLIBS} = "-ldl -lstdc++ -pthread";
+# $config{FLAGS} = "-fPIC -Woverloaded-virtual -Wshadow -Wall $config{OPTIMISATI}";
$config{FLAGS} .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
$config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
$config{MAKEPROG} = "make";
# rt = POSIX realtime extensions
# resolv = inet_aton only (why isnt this in nsl?!)
$config{MAKEPROG} = "gmake";
- $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv";
+ $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread";
return "Solaris";
}
chomp(my $revision2 = getrevision());
if ($writeheader == 1)
{
- print "Writing \033[1;32minspircd_config.h\033[0m\n";
+ print "Writing \e[1;32minspircd_config.h\e[0m\n";
open(FILEHANDLE, ">include/inspircd_config.h");
- my $NL = $config{NICK_LENGT}+1;
- my $CL = $config{CHAN_LENGT}+1;
print FILEHANDLE <<EOF;
/* Auto generated by configure, do not modify! */
#ifndef __CONFIGURATION_AUTO__
#define MOD_PATH "$config{MODULE_DIR}"
#define VERSION "$version"
#define REVISION "$revision2"
-#define MAXCLIENTS $config{MAX_CLIENT}
-#define MAXCLIENTS_S "$config{MAX_CLIENT}"
#define SOMAXCONN_S "$config{_SOMAXCONN}"
-#define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
-#define NICKMAX $NL
-#define CHANMAX $CL
-#define MAXMODES $config{MAXI_MODES}
-#define IDENTMAX $config{MAX_IDENT}
-#define MAXQUIT $config{MAX_QUIT}
-#define MAXTOPIC $config{MAX_TOPIC}
-#define MAXKICK $config{MAX_KICK}
-#define MAXGECOS $config{MAX_GECOS}
-#define MAXAWAY $config{MAX_AWAY}
#define OPTIMISATION $config{OPTIMITEMP}
#define LIBRARYDIR "$config{LIBRARY_DIR}"
#define SYSTEM "$incos"
+#define ENTRYPOINT int main(int argc, char** argv)
+
EOF
print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
if ($config{GCCVER} >= 3) {
print FILEHANDLE "#define GCC3\n";
}
+ if (
+ (($config{GCCVER} == 4) && ($config{GCCMINOR} >= 3))
+ ||
+ ($config{GCCVER} > 4)
+ ) {
+ print FILEHANDLE "#define HASHMAP_DEPRECATED\n";
+ }
if ($config{HAS_STRLCPY} eq "true") {
print FILEHANDLE "#define HAS_STRLCPY\n";
}
print FILEHANDLE "#define USE_SELECT\n";
$se = "socketengine_select";
}
- print FILEHANDLE "\n#endif\n";
+ print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
close(FILEHANDLE);
}
chomp($modules); # Remove Redundant whitespace..
opendir(DIRHANDLE, "src/modules");
- foreach my $name (sort readdir(DIRHANDLE)) {
- if ($name =~ /^m_(.+?)$/) {
- if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) {
+ foreach my $name2 (sort readdir(DIRHANDLE)) {
+ if ($name2 =~ /^m_(.+?)$/) {
+ if (defined(opendir(MDIRHANDLE, "src/modules/$name2"))) {
closedir(MDIRHANDLE);
- $modules .= "$name.so ";
- $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name.so\n";
+ $modules .= "$name2.so ";
+ $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name2.so\n";
}
}
}
# We can actually parse any file starting with . and ending with .inc,
# but right now we only parse .inspircd.inc to form './inspircd'
- print "Writing \033[1;32mMakefiles\033[0m\n";
+ print "Writing \e[1;32mMakefiles\e[0m\n";
write_dynamic_modules_makefile();
write_dynamic_makefile();
}
close(FILEHANDLE);
- print "Writing \033[1;32m$file\033[0m ...\n";
- $tmp =~ s/\@CC\@/$config{CC}/;
- $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
- $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
- $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
- $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
- $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
- $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
- $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
- $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
- $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
- $tmp =~ s/\@MODULES\@/$modules/;
- $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/;
- $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/;
- $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/;
- $tmp =~ s/\@EXECUTABLE\@/$exe/;
- $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
- $tmp =~ s/\@VERSION\@/$version/;
- $tmp =~ s/\@INSTALL_LIST\@/$install_list/;
- $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/;
+ print "Writing \e[1;32m$file\e[0m ...\n";
+ $tmp =~ s/\@CC\@/$config{CC}/ if defined $config{CC};
+ $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/ if defined $config{MAKEPROG};
+ $tmp =~ s/\@FLAGS\@/$config{FLAGS}/ if defined $config{FLAGS};
+ $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/ if defined $config{DEVELOPER};
+ $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/ if defined $config{LDLIBS};
+ $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/ if defined $config{BASE_DIR};
+ $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/ if defined $config{CONFIG_DIR};
+ $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/ if defined $config{MODULE_DIR};
+ $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/ if defined $config{BINARY_DIR};
+ $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/ if defined $config{LIBRARY_DIR};
+ $tmp =~ s/\@MODULES\@/$modules/ if defined $modules;
+ $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/ if defined $config{STARTSCRIPT};
+ $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/ if defined $config{DESTINATION};
+ $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/ if defined $config{EXTRA_DIR};
+ $tmp =~ s/\@EXECUTABLE\@/$exe/ if defined $exe;
+ $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/ if defined $config{MAKEORDER};
+ $tmp =~ s/\@VERSION\@/$version/ if defined $version;
+ $tmp =~ s/\@INSTALL_LIST\@/$install_list/ if defined $install_list;
+ $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list;
open(FILEHANDLE, ">$file");
print FILEHANDLE $tmp;
sub write_dynamic_modules_makefile {
# Modules Makefile..
- print "Writing \033[1;32msrc/modules/Makefile\033[0m\n";
+ print "Writing \e[1;32msrc/modules/Makefile\e[0m\n";
open(FILEHANDLE, ">src/modules/Makefile");
###
#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
- my $nicerflags = $config{FLAGS};
- $nicerflags =~ s/-pedantic//g;
-
if (nopedantic("src/modules/m_".$i.".cpp"))
{
print FILEHANDLE "
m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
- \$(CC) -pipe -I../../include $nicerflags $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(NICEFLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
"
}
else
{
print FILEHANDLE "
m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
- \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
";
}
$install_list = $install_list . " install -m \$(INSTMODE) src/modules/m_$i.so \$(MODPATH)\n";
# A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/
if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) {
read_module_directory("src/modules/$name", $name);
- print "Composing Makefile rules for directory \033[1;32m$name\033[0m... (\033[1;32m$mfcount files found\033[0m)\n";
+ print "Composing Makefile rules for directory \e[1;32m$name\e[0m... (\e[1;32m$mfcount files found\e[0m)\n";
print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n";
if ($config{IS_DARWIN} eq "YES") {
- print FILEHANDLE " \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n";
+ print FILEHANDLE " \@../../make/run-cc.pl \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n";
} else {
- print FILEHANDLE " \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n";
+ print FILEHANDLE " \@../../make/run-cc.pl \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n";
}
print FILEHANDLE "\n$mfrules\n";
closedir(MDIRHANDLE);
my $oname = $fname;
$oname =~ s/\.cpp$/.o/g;
$mfrules = $mfrules . "$reldpath/$oname: $reldpath/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n";
- $mfrules = $mfrules . " \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $reldpath/$oname -c $reldpath/$fname\n\n";
+ $mfrules = $mfrules . " \@../../make/run-cc.pl \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $reldpath/$oname -c $reldpath/$fname\n\n";
$mobjs = $mobjs . " $reldpath/$oname";
$mfcount++;
}
my $i = 0;
my @cmdlist = ();
my %existing_install_list = ();
+ my %core_files_list = ();
+
opendir(DIRHANDLE, "src/commands");
foreach my $name (sort readdir(DIRHANDLE))
{
$config{USE_PORTS} = 0;
}
+ # formerly generated below this foreach, now it's not! magic.
+ my $all_core = "";
+
foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules"))
{
- print "Scanning \033[1;32m$dir\033[0m for core files ";
+ print "Scanning \e[1;32m$dir\e[0m for core files ";
opendir(DIRHANDLE, $dir);
foreach my $name (sort readdir(DIRHANDLE))
{
while (defined(my $line = <CPP>))
{
chomp($line);
- if ($line =~ /\/\* \$Core: (\w+) \*\//i)
+ if ($line =~ /\/\* \$Core \*\//i)
{
- $filelist{$name} = $1;
+ my $sname = $name;
+ $sname =~ s/\.cpp$/.o/;
+
+ # append it to list to be built
+ $all_core = $all_core . $sname . " ";
+ $filelist{$name} = $sname;
+
+ # mark it as a core file, so it won't get shared object cflags
+ if (!exists($core_files_list{$name}))
+ {
+ $core_files_list{$name} = 1;
+ }
}
elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i)
{
}
elsif ($line =~ /\/\* \$If: (\w+) \*\//i)
{
- if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
+ if (defined $config{$1})
{
- # Skip to 'endif'
- while (defined($line = <CPP>))
+ if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
{
- chomp($line);
- die ("\$If buildsystem instruction within another \$If in file $dir/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
- last if ($line =~ /\/\* \$EndIf \*\//i);
+ # Skip to 'endif'
+ while (defined($line = <CPP>))
+ {
+ chomp($line);
+ die ("\$If buildsystem instruction within another \$If in file $dir/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
+ last if ($line =~ /\/\* \$EndIf \*\//i);
+ }
}
}
}
print " done!\n";
}
- my $freebsd4libs = $config{CRAQ};
+ # modes need to be compiled in too
+ $all_core = $all_core . "modes/modeclasses.a";
- my $all = "all: ";
- my $all_libsonly = "";
+ my $freebsd4libs = (defined $config{CRAQ} ? $config{CRAQ} : "");
- my $libraryext;
- my $othercrap;
- my $RPATH;
+ my $libraryext = "";
+ my $binary_rule = "";
if ($config{IS_DARWIN} eq "YES")
{
$libraryext = "dylib";
- $othercrap = " \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp\n \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
+ $binary_rule = " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp\n \@../make/run-cc.pl \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
}
else
{
$libraryext = "so";
- $RPATH = "-Wl,--rpath -Wl,$config{LIBRARY_DIR}" unless defined $opt_disablerpath;
- $othercrap = " \$(CC) -pipe -I../include $RPATH \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
- }
-
- foreach my $cpp (sort keys %filelist)
- {
- $all = $all . $filelist{$cpp} . "." . $libraryext . " ";
- $all_libsonly = $all_libsonly . $filelist{$cpp} . "." . $libraryext . " ";
- $install_list = $install_list . " -install -m \$(INSTMODE) src/" . $filelist{$cpp} . "." . $libraryext . " \$(LIBPATH)\n";
- $uninstall_list = $uninstall_list . " -rm \$(LIBPATH)/" . $filelist{$cpp} . "." . $libraryext . "\n";
+ $binary_rule = " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
}
- $all = $all . "moo inspircd\n";
-
- $othercrap = $othercrap . " $all_libsonly\n\n";
open(FH,">src/Makefile") or die("Could not write src/Makefile");
print FH <<EOM;
EOM
- print FH "$all\n\n";
-
- my $deps = calcdeps("src/inspircd.cpp");
- print FH "inspircd: inspircd.cpp $deps $all_libsonly\n";
- print FH "$othercrap\n";
+ my $buildstring = "";
+ my $deps = "";
foreach my $cpp (sort keys %filelist)
{
- my $thislib = $filelist{$cpp} . "." . $libraryext;
my $objs = $cpp;
my $rawcpp = $cpp;
- my $libcrap = "";
$objs =~ s/\.cpp$/.o/;
if (exists($extraobjects{$cpp}))
{
$objs = $objs . " " . $extraobjects{$cpp};
+ $all_core = $all_core . " " . $extraobjects{$cpp};
}
if (exists($extrasources{$cpp}))
{
$rawcpp = $rawcpp . " " . $extrasources{$cpp};
}
- if ($config{IS_DARWIN} eq "YES")
- {
- $libcrap = "-install_name " . $config{LIBRARY_DIR} . "/" . $thislib . " -dynamiclib -twolevel_namespace -undefined dynamic_lookup";
- }
- else
- {
- if (defined $opt_disablerpath)
- {
- $libcrap = " -shared";
- }
- else
- {
- $libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
- }
- }
+
$deps = calcdeps("src/$cpp");
if (exists($extrasources{$cpp}))
{
}
}
}
- print FH $thislib . ": $cpp $deps ". (defined($specialdeps{$cpp}) ? $specialdeps{$cpp} : "") . "\n";
- print FH " \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $rawcpp\n";
+ $buildstring = $buildstring . $objs . ": $cpp $deps ". (defined($specialdeps{$cpp}) ? $specialdeps{$cpp} : "") . "\n";
+
+ if (exists($core_files_list{$cpp}))
+ {
+ # core files are statically linked into the binary and do not require -export-dynamic
+ $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -c $rawcpp\n";
+ }
+ else
+ {
+ $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $rawcpp\n";
+ }
+
if (exists($extrabuildlines{$cpp}))
{
- print FH " " . $extrabuildlines{$cpp} . "\n";
+ $buildstring = $buildstring . " " . $extrabuildlines{$cpp} . "\n";
}
- print FH " \$(CC) -pipe $libcrap -o " . $thislib . " " . $objs . "\n\n";
}
- print FH "moo:\n \${MAKE} -C \"commands\" DIRNAME=\"src/commands\" CC=\"\$(CC)\" \$(MAKEARGS)\n\n";
+ print FH "all: inspircd moo\n\n\n";
+
+ $deps = calcdeps("src/inspircd.cpp");
+ print FH "inspircd: inspircd.cpp $deps $all_core\n";
+ print FH "$binary_rule $all_core\n\n";
+
+ print FH $buildstring;
+ print FH "moo:\n \@\${MAKE} -C \"commands\" DIRNAME=\"src/commands\" CC=\"\$(CC)\" \$(MAKEARGS)\n\n";
# close main makefile
close(FH);
# now print the command file details.
foreach my $cmd (@cmdlist) {
print FH <<ITEM;
-cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/globals.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
- \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
- \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
+cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
ITEM
}
-#try build a .so, no intermediate .o
-# \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so
+}
-#this works for sure
-# \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic -c cmd_$cmd.cpp
-# \$(CC) -pipe $SHARED -o cmd_$cmd.so cmd_$cmd.o
+# Routine to list out the extra/ modules that have been enabled.
+# Note: when getting any filenames out and comparing, it's important to lc it if the
+# file system is not case-sensitive (== Epoc, MacOS, OS/2 (incl DOS/DJGPP), VMS, Win32
+# (incl NetWare, Symbian)). Cygwin may or may not be case-sensitive, depending on
+# configuration, however, File::Spec does not currently tell us (it assumes Unix behavior).
+sub list_extras () {
+ use File::Spec;
+ # @_ not used
+ my $srcdir = File::Spec->catdir("src", "modules");
+ my $abs_srcdir = File::Spec->rel2abs($srcdir);
+ local $_;
+ my $dd;
+ opendir $dd, File::Spec->catdir($abs_srcdir, "extra") or die (File::Spec->catdir($abs_srcdir, "extra") . ": $!\n");
+ my @extras = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+ closedir $dd;
+ undef $dd;
+ opendir $dd, $abs_srcdir or die "$abs_srcdir: $!\n";
+ my @sources = map { File::Spec->case_tolerant() ? lc($_) : $_ } (readdir($dd));
+ closedir $dd;
+ undef $dd;
+ my $maxlen = (sort { $b <=> $a } (map {length($_)} (@extras)))[0];
+ my %extras = ();
+EXTRA: for my $extra (@extras) {
+ next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra);
+ next if ($extra eq '.svn');
+ my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
+ my $abs_source = File::Spec->catfile($abs_srcdir, $extra);
+ next unless ($extra =~ m/\.(cpp|h)$/ || (-d $abs_extra)); # C++ Source/Header, or directory
+ if (-l $abs_source) {
+ # Symlink, is it in the right place?
+ my $targ = readlink($abs_source);
+ my $abs_targ = File::Spec->rel2abs($targ, $abs_srcdir);
+ if ($abs_targ eq $abs_extra) {
+ $extras{$extra} = "\e[32;1menabled\e[0m";
+ } else {
+ $extras{$extra} = sprintf("\e[31;1mwrong symlink target (%s)\e[0m", $abs_targ);
+ }
+ } elsif (-e $abs_source) {
+ my ($devext, $inoext) = stat($abs_extra);
+ my ($devsrc, $inosrc, undef, $lnksrc) = stat($abs_source);
+ if ($lnksrc > 1) {
+ if ($devsrc == $devext && $inosrc == $inoext) {
+ $extras{$extra} = "\e[32;1menabled\e[0m";
+ } else {
+ $extras{$extra} = sprintf("\e[31;1mwrong hardlink target (%d:%d)\e[0m", $devsrc, $inosrc);
+ }
+ } else {
+ open my $extfd, "<", $abs_extra;
+ open my $srcfd, "<", $abs_source;
+ local $/ = undef;
+ if (scalar(<$extfd>) eq scalar(<$srcfd>)) {
+ $extras{$extra} = "\e[32;1menabled\e[0m";
+ } else {
+ $extras{$extra} = sprintf("\e[31;1mout of synch (re-copy)\e[0m");
+ }
+ }
+ } else {
+ $extras{$extra} = "\e[33;1mdisabled\e[0m";
+ }
+ }
+ # Now let's add dependency info
+ for my $extra (keys(%extras)) {
+ next unless $extras{$extra} =~ m/enabled/; # only process enabled extras.
+ my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra);
+ my @deps = split / +/, getdependencies($abs_extra);
+ for my $dep (@deps) {
+ if (exists($extras{$dep})) {
+ my $ref = \$extras{$dep}; # Take reference.
+ if ($$ref !~ m/needed by/) {
+ # First dependency found.
+ if ($$ref =~ m/enabled/) {
+ $$ref .= " (needed by \e[32;1m$extra\e[0m";
+ } else {
+ $$ref =~ s/\e\[.*?m//g; # Strip out previous coloring. Will be set in bold+red+blink later.
+ $$ref .= " (needed by \e[0;32;1;5m$extra\e[0;31;1;5m";
+ }
+ } else {
+ if ($$ref =~ m/enabled/) {
+ $$ref .= ", \e[32;1m$extra\e[0m";
+ } else {
+ $$ref .= ", \e[0;32;1;5m$extra\e[0;31;1;5m";
+ }
+ }
+ }
+ }
+ }
+ for my $extra (sort {$a cmp $b} keys(%extras)) {
+ my $text = $extras{$extra};
+ if ($text =~ m/needed by/ && $text !~ m/enabled/) {
+ printf "\e[31;1;5m%-*s = %s%s\e[0m\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? ")" : "");
+ } else {
+ printf "%-*s = %s%s\n", $maxlen, $extra, $text, ($text =~ m/needed by/ ? "\e[0m)" : "");
+ }
+ }
+ return keys(%extras) if wantarray; # Can be used by manage_extras.
+}
+
+sub enable_extras (@) {
+ my (@extras) = @_;
+ for my $extra (@extras) {
+ my $extrapath = "src/modules/extra/$extra";
+ if (!-e $extrapath) {
+ print STDERR "Cannot enable \e[32;1m$extra\e[0m : No such file or directory in src/modules/extra\n";
+ next;
+ }
+ my $source = "src/modules/$extra";
+ if (-e $source) {
+ print STDERR "Cannot enable \e[32;1m$extra\e[0m : destination in src/modules exists (might already be enabled?)\n";
+ next;
+ }
+ # Get dependencies, and add them to be processed.
+ my @deps = split / +/, getdependencies($extrapath);
+ for my $dep (@deps) {
+ next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway.
+ if (!-e "src/modules/$dep") {
+ if (-e "src/modules/extra/$dep") {
+ print STDERR "Will also enable extra \e[32;1m$dep\e[0m (needed by \e[32;1m$extra\e[0m)\n";
+ push @extras, $dep;
+ } else {
+ print STDERR "\e[33;1mWARNING:\e[0m module \e[32;1m$extra\e[0m might be missing dependency \e[32;1m$dep\e[0m - YOU are responsible for satisfying it!\n";
+ }
+ }
+ }
+ print "Enabling $extra ... \n";
+ symlink "extra/$extra", $source or print STDERR "$source: Cannot link to 'extra/$extra': $!\n";
+ }
}
+sub disable_extras (@)
+{
+ opendir my $dd, "src/modules/extra/";
+ my @files = readdir($dd);
+ closedir $dd;
+ my (@extras) = @_;
+EXTRA: for my $extra (@extras) {
+ my $extrapath = "src/modules/extra/$extra";
+ my $source = "src/modules/$extra";
+ if (!-e $extrapath) {
+ print STDERR "Cannot disable \e[32;1m$extra\e[0m : Is not an extra\n";
+ next;
+ }
+ if ((! -l $source) || readlink($source) ne "extra/$extra") {
+ print STDERR "Cannot disable \e[32;1m$extra\e[0m : Source is not a link or doesn't refer to the right file. Remove manually if this is in error.\n";
+ next;
+ }
+ # Check if anything needs this.
+ for my $file (@files) {
+ my @deps = split / +/, getdependencies("src/modules/extra/$file");
+ # File depends on this extra...
+ if (scalar(grep { $_ eq $extra } @deps) > 0) {
+ # And is both enabled and not about to be disabled.
+ if (-e "src/modules/$file" && scalar(grep { $_ eq $file } @extras) < 1) {
+ print STDERR "Cannot disable \e[32;1m$extra\e[0m : is needed by \e[32;1m$file\e[0m\n";
+ next EXTRA;
+ }
+ }
+ }
+ # Now remove.
+ print "Disabling $extra ... \n";
+ unlink "src/modules/$extra" or print STDERR "Cannot disable \e[32;1m$extra\e[0m : $!\n";
+ }
+}
projects / user / henk / code / inspircd.git / blobdiff