X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=c74dbb4e0d066d7e6a783cb47f982654481ea9bd;hb=d4414f54910aeaa4809a7eacea75a089a0820f40;hp=7f1bf68cdf487c5ae3303076b02ba8a13016c074;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/test-build b/tools/test-build
index 7f1bf68cd..c74dbb4e0 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -2,7 +2,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
+#   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
@@ -19,48 +19,60 @@
 
 
 BEGIN {
-	require 5.8.0;
+	require 5.10.0;
 	unless (-f 'configure') {
-		print "Error: test-build must be run from the main source directory!\n";
+		print "Error: $0 must be run from the main source directory!\n";
 		exit 1;
 	}
 }
 
+use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
+use FindBin qw($RealDir);
+
+use lib $RealDir;
+use make::common;
 use make::configure;
-use make::utilities;
 
-$ENV{D} = $ENV{V} = 1;
+$ENV{INSPIRCD_DEBUG} = $ENV{INSPIRCD_VERBOSE} = 1;
 
 system 'git', 'clean', '-dfx';
 
-foreach my $compiler ('g++', 'clang++', 'icpc') {
-	next if system "$compiler -v > /dev/null 2>&1";
+my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
+foreach my $compiler (@compilers) {
+	if (system "$compiler -v > /dev/null 2>&1") {
+		say "Skipping $compiler as it is not installed on this system!";
+		next;
+	}
 	$ENV{CXX} = $compiler;
-	my @socketengines = ( 'select' );
+	my @socketengines = qw(select);
 	push @socketengines, 'epoll' if test_header $compiler, 'sys/epoll.h';
 	push @socketengines, 'kqueue' if test_file $compiler, 'kqueue.cpp';
 	push @socketengines, 'poll' if test_header $compiler, 'poll.h';
-	push @socketengines, 'ports' if test_header $compiler, 'ports.h';
 	foreach my $socketengine (@socketengines) {
-		print "Attempting to build using the $compiler compiler and the $socketengine socket engine...\n";
-		if (system './configure', '--disable-interactive', "--socketengine=$socketengine") {
-			print "Failed to configure using the $compiler compiler and the $socketengine socket engine!\n";
+		say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
+		system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES};
+		if (system './configure', '--development', '--socketengine', $socketengine) {
+			say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		$ENV{PURE_STATIC} = 1;
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			print "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!\n";
-			exit 1;
+		if (!defined $ENV{TEST_BUILD_DYNAMIC}) {
+			$ENV{INSPIRCD_STATIC} = 1;
+			if (system 'make', '--jobs', get_cpu_count, 'install') {
+				say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!";
+				exit 1;
+			}
 		}
-		delete $ENV{PURE_STATIC};
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			print "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!\n";
-			exit 1;
+		if (!defined $ENV{TEST_BUILD_STATIC}) {
+			delete $ENV{INSPIRCD_STATIC};
+			if (system 'make', '--jobs', get_cpu_count, 'install') {
+				say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!";
+				exit 1;
+			}
 		}
-		print "Building using the $compiler compiler and the $socketengine socket engine succeeded!\n";
+		say "Building using the $compiler compiler and the $socketengine socket engine succeeded!";
 	}
 
 	system 'git', 'clean', '-dfx';