summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/common.pm91
-rw-r--r--make/configure.pm208
-rw-r--r--make/console.pm113
-rw-r--r--make/template/main.mk25
-rw-r--r--make/template/org.inspircd.plist4
-rw-r--r--make/test/compiler.cpp29
-rw-r--r--make/utilities.pm91
7 files changed, 354 insertions, 207 deletions
diff --git a/make/common.pm b/make/common.pm
new file mode 100644
index 000000000..24ef599ce
--- /dev/null
+++ b/make/common.pm
@@ -0,0 +1,91 @@
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+# Copyright (C) 2013-2014 Peter Powell <petpow@saberuk.com>
+#
+# This file is part of InspIRCd. InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+BEGIN {
+ require 5.8.0;
+}
+
+package make::common;
+
+use strict;
+use warnings FATAL => qw(all);
+
+use Exporter qw(import);
+use File::Spec::Functions qw(rel2abs);
+
+our @EXPORT = qw(get_cpu_count
+ get_version
+ module_installed);
+
+my %version;
+
+sub get_version {
+ return %version if %version;
+
+ # Attempt to retrieve version information from src/version.sh
+ chomp(my $vf = `sh src/version.sh 2>/dev/null`);
+ if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
+ %version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
+ }
+
+ # Attempt to retrieve missing version information from Git
+ chomp(my $gr = `git describe --tags 2>/dev/null`);
+ if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) {
+ $version{MAJOR} = $1 unless defined $version{MAJOR};
+ $version{MINOR} = $2 unless defined $version{MINOR};
+ $version{PATCH} = $3 unless defined $version{PATCH};
+ $version{LABEL} = $4 if defined $4;
+ }
+
+ # The user is using a stable release which does not have
+ # a label attached.
+ $version{LABEL} = 'release' unless defined $version{LABEL};
+
+ # If any of these fields are missing then the user has deleted the
+ # version file and is not running from Git. Fill in the fields with
+ # dummy data so we don't get into trouble with undef values later.
+ $version{MAJOR} = '0' unless defined $version{MAJOR};
+ $version{MINOR} = '0' unless defined $version{MINOR};
+ $version{PATCH} = '0' unless defined $version{PATCH};
+
+ return %version;
+}
+
+sub module_installed($) {
+ my $module = shift;
+ eval("use $module;");
+ return !$@;
+}
+
+sub get_cpu_count {
+ my $count = 1;
+ if ($^O =~ /bsd/) {
+ $count = `sysctl -n hw.ncpu`;
+ } elsif ($^O eq 'darwin') {
+ $count = `sysctl -n hw.activecpu`;
+ } elsif ($^O eq 'linux') {
+ $count = `getconf _NPROCESSORS_ONLN`;
+ } elsif ($^O eq 'solaris') {
+ $count = `psrinfo -p`;
+ }
+ chomp($count);
+ return $count;
+}
+
+1;
diff --git a/make/configure.pm b/make/configure.pm
index 905233835..8653edaac 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -30,19 +30,33 @@ package make::configure;
use strict;
use warnings FATAL => qw(all);
-use Cwd 'getcwd';
-use Exporter 'import';
-use File::Basename 'basename';
+use Cwd qw(getcwd);
+use Exporter qw(import);
+use File::Basename qw(basename);
+use make::common;
+use make::console;
use make::utilities;
-our @EXPORT = qw(cmd_clean cmd_help cmd_update
- read_configure_cache write_configure_cache
- get_compiler_info find_compiler
- run_test test_file test_header
- dump_hash get_property parse_templates);
-
-sub __get_socketengines() {
+use constant CONFIGURE_CACHE_FILE => '.configure.cache';
+use constant CONFIGURE_CACHE_VERSION => '1';
+
+our @EXPORT = qw(CONFIGURE_CACHE_FILE
+ CONFIGURE_CACHE_VERSION
+ cmd_clean
+ cmd_help
+ cmd_update
+ run_test
+ test_file
+ test_header
+ read_configure_cache
+ write_configure_cache
+ get_compiler_info
+ find_compiler
+ get_property
+ parse_templates);
+
+sub __get_socketengines {
my @socketengines;
foreach (<src/socketengines/socketengine_*.cpp>) {
s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
@@ -53,12 +67,12 @@ sub __get_socketengines() {
# TODO: when buildtool is done this can be mostly removed with
# the remainder being merged into parse_templates.
-sub __get_template_settings($$) {
+sub __get_template_settings($$$) {
# These are actually hash references
- my ($config, $compiler) = @_;
+ my ($config, $compiler, $version) = @_;
- # Start off by populating with the config
+ # Start off by populating with the config
my %settings = %$config;
# Compiler information
@@ -67,12 +81,12 @@ sub __get_template_settings($$) {
}
# Version information
- my %version = get_version();
- while (my ($key, $value) = each %version) {
+ while (my ($key, $value) = each %{$version}) {
$settings{'VERSION_' . $key} = $value;
}
# Miscellaneous information
+ $settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE;
$settings{SYSTEM_NAME} = lc $^O;
chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`);
@@ -80,7 +94,7 @@ sub __get_template_settings($$) {
}
sub cmd_clean {
- unlink '.config.cache';
+ unlink CONFIGURE_CACHE_FILE;
}
sub cmd_help {
@@ -111,11 +125,11 @@ PATH OPTIONS
[$PWD/run/data]
--log-dir=[dir] The location where the log files are stored.
[$PWD/run/logs]
+ --manual-dir=[dir] The location where the manual files are stored.
+ [$PWD/run/manuals]
--module-dir=[dir] The location where the loadable modules are
stored.
[$PWD/run/modules]
- --build-dir=[dir] The location to store files in while building.
-
EXTRA MODULE OPTIONS
@@ -129,10 +143,13 @@ MISC OPTIONS
--clean Remove the configuration cache file and start
the interactive configuration wizard.
--disable-interactive Disables the interactive configuration wizard.
+ --distribution-label=[text] 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.
- --uid=[name] Sets the user to run InspIRCd as.
--socketengine=[name] 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.
@@ -150,106 +167,88 @@ EOH
}
sub cmd_update {
- unless (-f '.config.cache') {
- print "You have not run $0 before. Please do this before trying to update the build files.\n";
- exit 1;
- }
+ print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f CONFIGURE_CACHE_FILE;
print "Updating...\n";
my %config = read_configure_cache();
my %compiler = get_compiler_info($config{CXX});
- parse_templates(\%config, \%compiler);
+ my %version = get_version();
+ parse_templates(\%config, \%compiler, \%version);
print "Update complete!\n";
exit 0;
}
+sub run_test($$) {
+ my ($what, $result) = @_;
+ print_format "Checking whether <|GREEN $what|> is available ... ";
+ print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n";
+ return $result;
+}
+
+sub test_file($$;$) {
+ my ($compiler, $file, $args) = @_;
+ my $status = 0;
+ $args ||= '';
+ $status ||= system "$compiler -o __test_$file make/test/$file $args >/dev/null 2>&1";
+ $status ||= system "./__test_$file >/dev/null 2>&1";
+ unlink "./__test_$file";
+ return !$status;
+}
+
+sub test_header($$;$) {
+ my ($compiler, $header, $args) = @_;
+ $args ||= '';
+ open(COMPILER, "| $compiler -E - $args >/dev/null 2>&1") or return 0;
+ print COMPILER "#include <$header>";
+ close(COMPILER);
+ return !$?;
+}
+
sub read_configure_cache {
- my %cfg = ();
- open(CACHE, '.config.cache') or return %cfg;
+ my %config;
+ open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
while (my $line = <CACHE>) {
next if $line =~ /^\s*($|\#)/;
my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
- $cfg{$key} = $value;
+ $config{$key} = $value;
}
close(CACHE);
- return %cfg;
+ return %config;
}
sub write_configure_cache(%) {
- my %cfg = @_;
- open(CACHE, ">.config.cache") or return 0;
- while (my ($key, $value) = each %cfg) {
- $value = "" unless defined $value;
+ print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n";
+ my %config = @_;
+ open(CACHE, '>', CONFIGURE_CACHE_FILE) or print_error "unable to write ${\CONFIGURE_CACHE_FILE}: $!";
+ while (my ($key, $value) = each %config) {
+ $value = '' unless defined $value;
print CACHE "$key=\"$value\"\n";
}
close(CACHE);
- return 1;
}
sub get_compiler_info($) {
my $binary = shift;
my $version = `$binary -v 2>&1`;
- if ($version =~ /(?:clang|llvm)\sversion\s(\d+\.\d+)/i) {
- return (
- NAME => 'Clang',
- VERSION => $1,
- UNSUPPORTED => $1 lt '3.0',
- REASON => 'Clang 2.9 and older do not have adequate C++ support.'
- );
+ if ($version =~ /clang\sversion\s(\d+\.\d+)/i || $version =~ /^apple.+\(based\son\sllvm\s(\d+\.\d+)/i) {
+ # Apple version their LLVM releases slightly differently to the mainline LLVM.
+ # See https://trac.macports.org/wiki/XcodeVersionInfo for more information.
+ return (NAME => 'Clang', VERSION => $1);
} elsif ($version =~ /gcc\sversion\s(\d+\.\d+)/i) {
- return (
- NAME => 'GCC',
- VERSION => $1,
- UNSUPPORTED => $1 lt '4.1',
- REASON => 'GCC 4.0 and older do not have adequate C++ support.'
- );
+ return (NAME => 'GCC', VERSION => $1);
} elsif ($version =~ /(?:icc|icpc)\sversion\s(\d+\.\d+).\d+\s\(gcc\sversion\s(\d+\.\d+).\d+/i) {
- return (
- NAME => 'ICC',
- VERSION => $1,
- UNSUPPORTED => $2 lt '4.1',
- REASON => "ICC $1 (GCC $2 compatibility mode) does not have adequate C++ support."
- );
+ return (NAME => 'ICC', VERSION => $1);
}
- return (
- NAME => $binary,
- VERSION => '0.0'
- );
+ return (NAME => $binary, VERSION => '0.0');
}
sub find_compiler {
- foreach my $compiler ('c++', 'g++', 'clang++', 'icpc') {
- return $compiler unless system "$compiler -v > /dev/null 2>&1";
- if ($^O eq 'Darwin') {
- return $compiler unless system "xcrun $compiler -v > /dev/null 2>&1";
+ my @compilers = qw(c++ g++ clang++ icpc);
+ foreach my $compiler (shift || @compilers) {
+ return $compiler if run_test "`$compiler`", test_file $compiler, 'compiler.cpp';
+ if ($^O eq 'darwin') {
+ return $compiler if run_test "`xcrun $compiler`", test_file "xcrun $compiler", 'compiler.cpp';
}
}
- return "";
-}
-
-sub run_test($$) {
- my ($what, $result) = @_;
- print "Checking whether $what is available... ";
- print $result ? "yes\n" : "no\n";
- return $result;
-}
-
-sub test_file($$;$) {
- my ($cc, $file, $args) = @_;
- my $status = 0;
- $args ||= '';
- $status ||= system "$cc -o __test_$file make/test/$file $args >/dev/null 2>&1";
- $status ||= system "./__test_$file >/dev/null 2>&1";
- unlink "./__test_$file";
- return !$status;
-}
-
-sub test_header($$;$) {
- my ($cc, $header, $args) = @_;
- $args ||= '';
- open(CC, "| $cc -E - $args >/dev/null 2>&1") or return 0;
- print CC "#include <$header>";
- close(CC);
- return !$?;
}
sub get_property($$;$)
@@ -267,31 +266,18 @@ sub get_property($$;$)
return defined $default ? $default : '';
}
-sub dump_hash() {
- print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n";
- print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
- print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
- print "\e[0mData path:\e[1;32m\t\t\t$main::config{DATA_DIR}\e[0m\n";
- print "\e[0mLog path:\e[1;32m\t\t\t$main::config{LOG_DIR}\e[0m\n";
- print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
- print "\e[0mCompiler:\e[1;32m\t\t\t$main::cxx{NAME} $main::cxx{VERSION}\e[0m\n";
- print "\e[0mSocket engine:\e[1;32m\t\t\t$main::config{SOCKETENGINE}\e[0m\n";
- print "\e[0mGnuTLS support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
- print "\e[0mOpenSSL support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n";
-}
-
-sub parse_templates($$) {
+sub parse_templates($$$) {
# These are actually hash references
- my ($config, $compiler) = @_;
+ my ($config, $compiler, $version) = @_;
# Collect settings to be used when generating files
- my %settings = __get_template_settings($config, $compiler);
+ my %settings = __get_template_settings($config, $compiler, $version);
# Iterate through files in make/template.
foreach (<make/template/*>) {
- print "Parsing $_...\n";
- open(TEMPLATE, $_);
+ print_format "Parsing <|GREEN $_|> ...\n";
+ open(TEMPLATE, $_) or print_error "unable to read $_: $!";
my (@lines, $mode, @platforms, %targets);
# First pass: parse template variables and directives.
@@ -302,9 +288,9 @@ sub parse_templates($$) {
while ($line =~ /(@(\w+?)@)/) {
my ($variable, $name) = ($1, $2);
if (defined $settings{$name}) {
- $line =~ s/$variable/$settings{$name}/;
+ $line =~ s/\Q$variable\E/$settings{$name}/;
} else {
- print STDERR "Warning: unknown template variable '$name' in $_!\n";
+ print_warning "unknown template variable '$name' in $_!";
last;
}
}
@@ -328,7 +314,7 @@ sub parse_templates($$) {
$targets{DEFAULT} = $2;
}
} else {
- print STDERR "Warning: unknown template command '$1' in $_!\n";
+ print_warning "unknown template command '$1' in $_!";
push @lines, $line;
}
next;
@@ -413,7 +399,7 @@ sub parse_templates($$) {
# HACK: silently ignore if lower case as these are probably make commands.
push @final_lines, $line;
} else {
- print STDERR "Warning: unknown template command '$1' in $_!\n";
+ print_warning "unknown template command '$1' in $_!";
push @final_lines, $line;
}
next;
@@ -423,8 +409,8 @@ sub parse_templates($$) {
}
# Write the template file.
- print "Writing $target...\n";
- open(TARGET, ">$target");
+ print_format "Writing <|GREEN $target|> ...\n";
+ open(TARGET, '>', $target) or print_error "unable to write $_: $!";
foreach (@final_lines) {
print TARGET $_, "\n";
}
diff --git a/make/console.pm b/make/console.pm
new file mode 100644
index 000000000..9be5ef47c
--- /dev/null
+++ b/make/console.pm
@@ -0,0 +1,113 @@
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+# Copyright (C) 2014 Peter Powell <petpow@saberuk.com>
+#
+# This file is part of InspIRCd. InspIRCd is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+package make::console;
+
+BEGIN {
+ require 5.8.0;
+}
+
+use strict;
+use warnings FATAL => qw(all);
+
+use File::Path qw(mkpath);
+use File::Spec::Functions qw(rel2abs);
+use Exporter qw(import);
+
+our @EXPORT = qw(print_format
+ print_error
+ print_warning
+ prompt_bool
+ prompt_dir
+ prompt_string);
+
+my %FORMAT_CODES = (
+ DEFAULT => "\e[0m",
+ BOLD => "\e[1m",
+
+ RED => "\e[1;31m",
+ GREEN => "\e[1;32m",
+ YELLOW => "\e[1;33m",
+ BLUE => "\e[1;34m"
+);
+
+sub __console_format($$) {
+ my ($name, $data) = @_;
+ return $data unless -t STDOUT;
+ return $FORMAT_CODES{uc $name} . $data . $FORMAT_CODES{DEFAULT};
+}
+
+sub print_format($;$) {
+ my $message = shift;
+ my $stream = shift || *STDOUT;
+ while ($message =~ /(<\|(\S+)\s(.+?)\|>)/) {
+ my $formatted = __console_format $2, $3;
+ $message =~ s/\Q$1\E/$formatted/;
+ }
+ print { $stream } $message;
+}
+
+sub print_error($) {
+ my $message = shift;
+ print_format "<|RED Error:|> $message\n", *STDERR;
+ exit 1;
+}
+
+sub print_warning($) {
+ my $message = shift;
+ print_format "<|YELLOW Warning:|> $message\n", *STDERR;
+}
+
+sub prompt_bool($$$) {
+ my ($interactive, $question, $default) = @_;
+ my $answer = prompt_string($interactive, $question, $default ? 'y' : 'n');
+ return $answer =~ /y/i;
+}
+
+sub prompt_dir($$$) {
+ my ($interactive, $question, $default) = @_;
+ my ($answer, $create);
+ do {
+ $answer = rel2abs(prompt_string($interactive, $question, $default));
+ $create = prompt_bool($interactive && !-d $answer, "$answer does not exist. Create it?", 'y');
+ if ($create) {
+ my $mkpath = eval {
+ mkpath($answer, 0, 0750);
+ return 1;
+ };
+ unless (defined $mkpath) {
+ print_warning "unable to create $answer!\n";
+ $create = 0;
+ }
+ }
+ } while (!$create);
+ return $answer;
+}
+
+sub prompt_string($$$) {
+ my ($interactive, $question, $default) = @_;
+ return $default unless $interactive;
+ print_format "$question\n";
+ print_format "[<|GREEN $default|>] => ";
+ chomp(my $answer = <STDIN>);
+ print "\n";
+ return $answer ? $answer : $default;
+}
+
+1;
diff --git a/make/template/main.mk b/make/template/main.mk
index 5806d568a..b4d77e4e6 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -43,6 +43,7 @@ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
BASE = "$(DESTDIR)@BASE_DIR@"
CONPATH = "$(DESTDIR)@CONFIG_DIR@"
+MANPATH = "$(DESTDIR)@MANUAL_DIR@"
MODPATH = "$(DESTDIR)@MODULE_DIR@"
DATPATH = "$(DESTDIR)@DATA_DIR@"
BINPATH = "$(DESTDIR)@BINARY_DIR@"
@@ -53,7 +54,10 @@ INSTMODE_BIN = 0750
INSTMODE_LIB = 0640
@IFNEQ $(COMPILER) ICC
- CORECXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute
+ CORECXXFLAGS += -Woverloaded-virtual -Wshadow
+@IFNEQ $(SYSTEM) openbsd
+ CORECXXFLAGS += -pedantic -Wformat=2 -Wmissing-format-attribute
+@ENDIF
@ENDIF
@IFNEQ $(SYSTEM)-$(COMPILER) darwin-GCC
@@ -225,6 +229,7 @@ install: target
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
@IFNDEF PURE_STATIC
@@ -238,10 +243,11 @@ install: target
@IFEQ $(SYSTEM) linux
-$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null
@ENDIF
- -$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(BASE) 2>/dev/null
- -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(BASE) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+ -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH)
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
@echo ""
@@ -258,7 +264,10 @@ install: target
@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
@echo 'Examples are available at:' $(CONPATH)/examples/
-GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure .config.cache
+@TARGET BSD_MAKE CONFIGURE_CACHE_FILE = @CONFIGURE_CACHE_FILE@
+@TARGET GNU_MAKE CONFIGURE_CACHE_FILE = $(wildcard @CONFIGURE_CACHE_FILE@)
+
+GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure $(CONFIGURE_CACHE_FILE)
./configure -update
@TARGET BSD_MAKE .MAKEFILEDEPS: BSDmakefile
@@ -273,17 +282,23 @@ clean:
deinstall:
-rm -f $(BINPATH)/inspircd
-rm -rf $(CONPATH)/examples
+ -rm -f $(MANPATH)/inspircd.1
+ -rm -f $(MANPATH)/inspircd-genssl.1
-rm -f $(MODPATH)/*.so
-rm -f $(BASE)/.gdbargs
+ -rm -f $(BASE)/inspircd.service
-rm -f $(BASE)/org.inspircd.plist
configureclean:
- rm -f .config.cache
rm -f BSDmakefile
rm -f GNUmakefile
rm -f include/config.h
rm -f inspircd
+ rm -f inspircd.1
+ rm -f inspircd-genssl.1
+ -rm -f inspircd.service
-rm -f org.inspircd.plist
+ -rm -f @CONFIGURE_CACHE_FILE@
distclean: clean configureclean
-rm -rf $(SOURCEPATH)/run
diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist
index 4bcb3e7c3..07a3446b5 100644
--- a/make/template/org.inspircd.plist
+++ b/make/template/org.inspircd.plist
@@ -23,6 +23,8 @@
<key>ServiceIPC</key>
<false/>
<key>UserName</key>
- <string>ircdaemon</string>
+ <string>@USER@</string>
+ <key>GroupName</key>
+ <string>@GROUP@</string>
</dict>
</plist>
diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp
new file mode 100644
index 000000000..1c3e1d875
--- /dev/null
+++ b/make/test/compiler.cpp
@@ -0,0 +1,29 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <iostream>
+#if defined _LIBCPP_VERSION
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+#endif
+
+int main() {
+ std::cout << "Hello, World!" << std::endl;
+ return 0;
+}
diff --git a/make/utilities.pm b/make/utilities.pm
index 7db557d11..dc286da5e 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -32,101 +32,12 @@ use warnings FATAL => qw(all);
use Exporter 'import';
use Fcntl;
use File::Path;
-use File::Spec::Functions qw(rel2abs);
use Getopt::Long;
use POSIX;
-our @EXPORT = qw(get_version module_installed prompt_bool prompt_dir prompt_string get_cpu_count make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
+our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
my %already_added = ();
-my %version = ();
-
-sub get_version {
- return %version if %version;
-
- # Attempt to retrieve version information from src/version.sh
- chomp(my $vf = `sh src/version.sh 2>/dev/null`);
- if ($vf =~ /^InspIRCd-([0-9]+)\.([0-9]+)\.([0-9]+)(?:\+(\w+))?$/) {
- %version = ( MAJOR => $1, MINOR => $2, PATCH => $3, LABEL => $4 );
- }
-
- # Attempt to retrieve missing version information from Git
- chomp(my $gr = `git describe --tags 2>/dev/null`);
- if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-(\w+))?$/) {
- $version{MAJOR} = $1 unless defined $version{MAJOR};
- $version{MINOR} = $2 unless defined $version{MINOR};
- $version{PATCH} = $3 unless defined $version{PATCH};
- $version{LABEL} = $4 if defined $4;
- }
-
- # The user is using a stable release which does not have
- # a label attached.
- $version{LABEL} = 'release' unless defined $version{LABEL};
-
- # If any of these fields are missing then the user has deleted the
- # version file and is not running from Git. Fill in the fields with
- # dummy data so we don't get into trouble with undef values later.
- $version{MAJOR} = '0' unless defined $version{MAJOR};
- $version{MINOR} = '0' unless defined $version{MINOR};
- $version{PATCH} = '0' unless defined $version{PATCH};
-
- return %version;
-}
-
-sub module_installed($) {
- my $module = shift;
- eval("use $module;");
- return !$@;
-}
-
-sub prompt_bool($$$) {
- my ($interactive, $question, $default) = @_;
- my $answer = prompt_string($interactive, $question, $default ? 'y' : 'n');
- return $answer =~ /y/i;
-}
-
-sub prompt_dir($$$) {
- my ($interactive, $question, $default) = @_;
- my ($answer, $create) = (undef, 'y');
- do {
- $answer = rel2abs(prompt_string($interactive, $question, $default));
- $create = prompt_bool($interactive && !-d $answer, "$answer does not exist. Create it?", 'y');
- my $mkpath = eval {
- mkpath($answer, 0, 0750);
- return 1;
- };
- unless (defined $mkpath) {
- print "Error: unable to create $answer!\n\n";
- $create = 0;
- }
- } while (!$create);
- return $answer;
-}
-
-sub prompt_string($$$) {
- my ($interactive, $question, $default) = @_;
- return $default unless $interactive;
- print $question, "\n";
- print "[\e[1;32m$default\e[0m] => ";
- chomp(my $answer = <STDIN>);
- print "\n";
- return $answer ? $answer : $default;
-}
-
-sub get_cpu_count {
- my $count = 1;
- if ($^O =~ /bsd/) {
- $count = `sysctl -n hw.ncpu`;
- } elsif ($^O eq 'darwin') {
- $count = `sysctl -n hw.activecpu`;
- } elsif ($^O eq 'linux') {
- $count = `getconf _NPROCESSORS_ONLN`;
- } elsif ($^O eq 'solaris') {
- $count = `psrinfo -p`;
- }
- chomp($count);
- return $count;
-}
sub promptstring($$$$$)
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 08:21:44 +0000