#
###############################################################################################
-our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_ports, $opt_epoll, $opt_kqueue,
- $opt_noports, $opt_noepoll, $opt_nokqueue, $opt_maxbuf, $opt_freebsd_port, $opt_system, $opt_uid);
+our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_socketengine, $opt_freebsd_port,
+ $opt_system, $opt_uid);
-our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir);
+our ($opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir);
sub list_extras ();
'uid=s' => \$opt_uid,
'enable-openssl' => \$opt_use_openssl,
'disable-interactive' => \$opt_nointeractive,
- 'enable-ports' => \$opt_ports,
- 'enable-epoll' => \$opt_epoll,
- 'enable-kqueue' => \$opt_kqueue,
- 'disable-ports' => \$opt_noports,
- 'disable-epoll' => \$opt_noepoll,
- 'disable-kqueue' => \$opt_nokqueue,
- 'with-cc=s' => \$opt_cc,
- 'with-maxbuf=i' => \$opt_maxbuf,
+ 'socketengine=s' => \$opt_socketengine,
'enable-freebsd-ports-openssl' => \$opt_freebsd_port,
'prefix=s' => \$opt_base_dir,
'config-dir=s' => \$opt_config_dir,
(defined $opt_data_dir) ||
(defined $opt_log_dir) ||
(defined $opt_nointeractive) ||
- (defined $opt_cc) ||
- (defined $opt_kqueue) ||
- (defined $opt_epoll) ||
- (defined $opt_ports) ||
+ (defined $opt_socketengine) ||
(defined $opt_use_openssl) ||
- (defined $opt_nokqueue) ||
- (defined $opt_noepoll) ||
- (defined $opt_noports) ||
- (defined $opt_maxbuf) ||
(defined $opt_system) ||
(defined $opt_uid) ||
(defined $opt_use_gnutls) ||
}
$config{HAS_STDINT} = "false"; # stdint.h check
-$config{USE_KQUEUE} = "y"; # kqueue enabled
-if (defined $opt_nokqueue) {
- $config{USE_KQUEUE} = "n";
-}
-$config{USE_POLL} = "y"; # poll enabled
-$config{USE_EPOLL} = "y"; # epoll enabled
-if (defined $opt_noepoll)
-{
- $config{USE_EPOLL} = "n";
-}
-$config{USE_PORTS} = "y"; # epoll enabled
-if (defined $opt_noports)
-{
- $config{USE_PORTS} = "n";
-}
$config{OSNAME} = $^O; # Operating System Name
$config{STARTSCRIPT} = "inspircd"; # start script?
$config{DESTINATION} = "BASE"; # Is target path.
if ($config{OSNAME} =~ /darwin/i)
{
$config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
- $config{CC} = "xcrun clang++"; # C++ compiler for OSX.
}
-else
-{
- $config{CC} = "g++"; # C++ compiler
+
+$config{CXX} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler();
+if ($config{CXX} eq "") {
+ print "A C++ compiler could not be detected on your system!\n";
+ print "Set the CXX environment variable to the full path if this is incorrect.\n";
+ exit 1;
}
-if (defined $opt_cc)
-{
- $config{CC} = $opt_cc;
+
+our %cxx = get_compiler_info($config{CXX});
+if ($cxx{UNSUPPORTED}) {
+ print "Your C++ compiler is too old to build InspIRCd!\n";
+ print "Reason: $cxx{REASON}\n";
+ exit 1;
}
-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{MAXBUF} = "512"; # Max buffer size
if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) {
$config{HAS_OPENSSL} = $1;
$config{HAS_OPENSSL} = "";
}
-if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) {
- if ($config{OSNAME} eq 'darwin') {
- print $config{CC} . " was not found! You require clang++ (the LLVM C++ compiler, part of the OSX developer tools) to build InspIRCd!\n";
- } else {
- print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n";
- }
- exit;
-}
-
# Get and Set some important vars..
getmodules();
unlink(".config.cache");
}
-our ($has_epoll, $has_ports, $has_kqueue) = (0, 0, 0);
-
sub update
{
eval {
} else {
# We've Loaded the cache file and all our variables..
print "Updating files...\n";
- $has_epoll = $config{HAS_EPOLL};
- $has_ports = $config{HAS_PORTS};
- $has_kqueue = $config{HAS_KQUEUE};
+ %cxx = get_compiler_info($config{CXX});
writefiles(1);
makecache();
print "Complete.\n";
$config{SYSTEM} = lc $^O;
print "Checking operating system version... $config{SYSTEM}\n";
-$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`);
-
-
print "Checking whether <stdint.h> exists... ";
-if (test_header($config{CC}, "stdint.h")) {
+if (test_header($config{CXX}, "stdint.h")) {
$config{HAS_STDINT} = "true";
print "yes\n";
} else {
}
printf "Checking whether clock_gettime() exists... ";
-if (test_file($config{CC}, "clock_gettime.cpp", "-lrt")) {
+if (test_file($config{CXX}, "clock_gettime.cpp", "-lrt")) {
$config{HAS_CLOCK_GETTIME} = "true";
print "yes\n";
} else {
}
printf "Checking whether eventfd() exists... ";
-if (test_file($config{CC}, "eventfd.cpp")) {
+if (test_file($config{CXX}, "eventfd.cpp")) {
$config{HAS_EVENTFD} = "true";
print "yes\n";
} else {
print "no\n";
}
-printf "Checking if a TCP deferring mechanism is available... ";
-if (test_file($config{CC}, "tcp_defer_accept.cpp")) {
- $config{HAS_DEFER} = "TCP_DEFER_ACCEPT";
- print "yes (TCP_DEFER_ACCEPT)\n";
-} elsif (test_file($config{CC}, "so_acceptfilter.cpp")) {
- $config{HAS_DEFER} = "SO_ACCEPTFILTER";
- print "yes (SO_ACCEPTFILTER)\n";
-} else {
- $config{HAS_DEFER} = "false";
- print "no\n";
-}
-
print "Checking whether epoll is available... ";
-$has_epoll = test_header($config{CC}, "sys/epoll.h");
-print $has_epoll ? "yes\n" : "no\n";
+$config{HAS_EPOLL} = test_header($config{CXX}, "sys/epoll.h");
+print $config{HAS_EPOLL} ? "yes\n" : "no\n";
+$config{SOCKETENGINE} ||= "epoll" if $config{HAS_EPOLL};
print "Checking whether Kqueue is available... ";
-$has_kqueue = test_file($config{CC}, "kqueue.cpp");
-print $has_kqueue ? "yes\n" : "no\n";
+$config{HAS_KQUEUE} = test_file($config{CXX}, "kqueue.cpp");
+print $config{HAS_KQUEUE} ? "yes\n" : "no\n";
+$config{SOCKETENGINE} ||= "kqueue" if $config{HAS_KQUEUE};
print 'Checking whether Solaris IOCP is available... ';
-$has_ports = test_header($config{CC}, 'port.h');
-print $has_ports ? "yes\n" : "no\n";
-
-$config{HAS_EPOLL} = $has_epoll;
-$config{HAS_KQUEUE} = $has_kqueue;
+$config{HAS_PORTS} = test_header($config{CXX}, 'port.h');
+print $config{HAS_PORTS} ? "yes\n" : "no\n";
+$config{SOCKETENGINE} ||= "ports" if $config{HAS_PORTS};
+
+print 'Checking whether poll is available... ';
+$config{HAS_POLL} = test_header($config{CXX}, 'poll.h');
+print $config{HAS_POLL} ? "yes\n" : "no\n";
+$config{SOCKETENGINE} ||= "poll" if $config{HAS_POLL};
+
+# Select is available on all platforms
+$config{HAS_SELECT} = 1;
+$config{SOCKETENGINE} ||= "select";
+
+if (defined $opt_socketengine) {
+ my $cfgkey = "HAS_" . uc $opt_socketengine;
+ if ($config{$cfgkey} && -f "src/socketengines/socketengine_$opt_socketengine.cpp") {
+ $config{SOCKETENGINE} = $opt_socketengine;
+ } else {
+ print "Unable to use a socket engine which is not supported on this platform ($opt_socketengine)!\n";
+ print "Available socket engines are:";
+ foreach (<src/socketengines/socketengine_*.cpp>) {
+ s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
+ print " $1" if $config{"HAS_" . uc $1};
+ }
+ print "\n";
+ exit 1;
+ }
+}
printf "Checking for libgnutls... ";
if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) {
}
print ".\n\n";
- $config{CHANGE_COMPILER} = "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 "\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 "[\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
- 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} < 4 || $config{GCCVER} == 4 && $config{GCCMINOR} < 1) {
- print "\e[1;32mGCC 4.1 and earlier WILL NOT WORK!\e[0m. Let's try that again, shall we?\n";
- }
- }
- else {
- print "\e[1;32mWARNING!\e[0m Could not execute the compiler you specified. You may want to try again.\n";
- }
- }
- }
-
- print "\n";
+ print "I have detected the following compiler: \e[1;32m$cxx{NAME}\e[0m (version \e[1;32m$cxx{VERSION}\e[0m)\n\n";
# Directory Settings..
my $tmpbase = $config{BASE_DIR};
dir_check("do you want the build to take place", "BUILD_DIR");
my $chose_hiperf = 0;
- if ($has_kqueue) {
+ if ($config{HAS_KQUEUE}) {
+ $config{USE_KQUEUE} = "y";
yesno('USE_KQUEUE',"You are running a BSD operating system, and kqueue\nwas detected. Would you like to enable kqueue support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable kqueue?");
print "\n";
if ($config{USE_KQUEUE} eq "y") {
+ $config{SOCKETENGINE} = "kqueue";
$chose_hiperf = 1;
}
}
- if ($has_epoll) {
+ if ($config{HAS_EPOLL}) {
+ $config{USE_EPOLL} = "y";
yesno('USE_EPOLL',"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?");
print "\n";
if ($config{USE_EPOLL} eq "y") {
+ $config{SOCKETENGINE} = "epoll";
$chose_hiperf = 1;
}
}
- if ($has_ports) {
+ if ($config{HAS_PORTS}) {
+ $config{USE_PORTS} = "y";
yesno('USE_PORTS',"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?");
print "\n";
if ($config{USE_PORTS} eq "y") {
+ $config{SOCKETENGINE} = "ports";
$chose_hiperf = 1;
}
}
- if (!$chose_hiperf) {
- yesno('USE_POLL', "Would you like to use poll?\n This is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?");
- if ($config{USE_POLL} ne "y")
- {
- print "No high-performance socket engines are available, or you chose\n";
- print "not to enable one. Defaulting to select() engine.\n\n";
+ if (!$chose_hiperf && $config{HAS_POLL}) {
+ $config{USE_POLL} = "y";
+ yesno('USE_POLL', "Would you like to use poll?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?");
+ if ($config{USE_POLL} eq "y") {
+ $config{SOCKETENGINE} = "poll";
}
}
+ if (!$chose_hiperf && $config{USE_POLL} ne "y")
+ {
+ print "No high-performance socket engines are available, or you chose\n";
+ print "not to enable one. Defaulting to select() engine.\n\n";
+ $config{SOCKETENGINE} = "select";
+ }
$config{USE_FREEBSD_BASE_SSL} = "n";
$config{USE_FREEBSD_PORTS_SSL} = "n";
# We are on a POSIX system, we can enable POSIX extras without asking
symlink "extra/m_regex_posix.cpp", "src/modules/m_regex_posix.cpp";
-dumphash();
-
if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
{
print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n";
depcheck();
writefiles(1);
makecache();
+dumphash();
-print "\n\n";
+print "\n";
print "To build your server with these settings, please run '\e[1;32mmake\e[0m' now.\n";
if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) {
print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n";
print "build process. For more info please refer to:\n";
print "\e[1;32mhttp://wiki.inspircd.org/Installation_From_Tarball\e[0m\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 "\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;
-\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
-to a newer 3.x or 4.x (or whatever is available currently) version.
-FOO2
-}
+print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n";
################################################################################
# HELPER FUNCTIONS #
#define MOD_PATH "$config{MODULE_DIR}"
EOF
-print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
- if ($config{OSNAME} =~ /SunOS/i) {
- print FILEHANDLE "#define IS_SOLARIS\n";
- }
- if ($config{OSNAME} =~ /MINGW32/i) {
- print FILEHANDLE "#define IS_MINGW\n";
- }
- if ($config{GCCVER} >= 3) {
- print FILEHANDLE "#define GCC3\n";
- }
if ($config{HAS_STDINT} eq "true") {
print FILEHANDLE "#define HAS_STDINT\n";
}
if ($config{HAS_CLOCK_GETTIME} eq 'true') {
print FILEHANDLE "#define HAS_CLOCK_GETTIME\n";
}
- my $use_hiperf = 0;
- if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) {
- print FILEHANDLE "#define USE_KQUEUE\n";
- $config{SOCKETENGINE} = "socketengine_kqueue";
- $use_hiperf = 1;
- }
- if (($has_epoll) && ($config{USE_EPOLL} eq "y")) {
- print FILEHANDLE "#define USE_EPOLL\n";
- $config{SOCKETENGINE} = "socketengine_epoll";
- $use_hiperf = 1;
- }
- if (($has_ports) && ($config{USE_PORTS} eq "y")) {
- print FILEHANDLE "#define USE_PORTS\n";
- $config{SOCKETENGINE} = "socketengine_ports";
- $use_hiperf = 1;
- }
- # user didn't choose either epoll or select for their OS.
- # default them to USE_SELECT (ewwy puke puke)
- if (!$use_hiperf) {
- print "no hi-perf, " . $config{USE_POLL};
- if ($config{USE_POLL} eq "y")
- {
- print FILEHANDLE "#define USE_POLL\n";
- $config{SOCKETENGINE} = "socketengine_poll";
- }
- else
- {
- print FILEHANDLE "#define USE_SELECT\n";
- $config{SOCKETENGINE} = "socketengine_select";
- }
- }
-
- if ($config{HAS_DEFER} eq "TCP_DEFER_ACCEPT") {
- print FILEHANDLE "#define USE_TCP_DEFER_ACCEPT";
- } elsif ($config{HAS_DEFER} eq "SO_ACCEPTFILTER") {
- print FILEHANDLE "#define USE_SO_ACCEPTFILTER"
- }
print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n";
close(FILEHANDLE);
chomp(my $revision = getrevision());
$version = "$version(r$revision)";
- # We can actually parse any file starting with . and ending with .inc,
- # but right now we only parse .inspircd.inc to form './inspircd'
- prepare_dynamic_makefile();
-
my @dotfiles = qw(main.mk inspircd);
push @dotfiles, 'org.inspircd.plist' if $config{OSNAME} eq 'darwin';
close(FILEHANDLE);
$config{BUILD_DIR} ||= resolve_directory($config{ME}."/build");
+ $config{COMPILER} = lc $cxx{NAME};
for my $var (qw(
- CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
+ CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
STARTSCRIPT DESTINATION SOCKETENGINE
)) {
s/\@$var\@/$config{$var}/g;
s/\@IFDEF (\S+)/ifdef $1/g;
s/\@IFNDEF (\S+)/ifndef $1/g;
s/\@IFEQ (\S+) (\S+)/ifeq ($1,$2)/g;
+ s/\@IFNEQ (\S+) (\S+)/ifneq ($1,$2)/g;
s/\@ELSIFEQ (\S+) (\S+)/else ifeq ($1,$2)/g;
s/\@ELSE/else/g;
s/\@ENDIF/endif/g;
s/\@IFDEF (\S+)/.if defined($1)/g;
s/\@IFNDEF (\S+)/.if !defined($1)/g;
s/\@IFEQ (\S+) (\S+)/.if $1 == $2/g;
+ s/\@IFNEQ (\S+) (\S+)/.if $1 != $2/g;
s/\@ELSIFEQ (\S+) (\S+)/.elif $1 == $2/g;
s/\@ELSE/.else/g;
s/\@ENDIF/.endif/g;
}
}
-sub prepare_dynamic_makefile
-{
- my $i = 0;
-
- if (!$has_epoll)
- {
- $config{USE_EPOLL} = 0;
- }
- if (!$has_kqueue)
- {
- $config{USE_KQUEUE} = 0;
- }
- if (!$has_ports)
- {
- $config{USE_PORTS} = 0;
- }
-}
-
# 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
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/$dep" && !-e "include/$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;
projects / user / henk / code / inspircd.git / blobdiff