-#!/usr/bin/perl
+#!/usr/bin/env perl
+
+#
+# InspIRCd -- Internet Relay Chat Daemon
+#
+# Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+#
+# 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/>.
+#
+
+
use strict;
use warnings;
use POSIX qw(getcwd);
sub find_output;
sub gendep($);
-sub dep_cpp($$);
-sub dep_dir($);
+sub dep_cpp($$$);
+sub dep_so($);
+sub dep_dir($$);
sub run();
my %f2dep;
my $build = $ENV{BUILDPATH};
mkdir $build;
chdir $build or die "Could not open build directory: $!";
+ unlink 'include';
symlink "$ENV{SOURCEPATH}/include", 'include';
mkdir $_ for qw/bin modules obj/;
# BSD make has a horribly annoying bug resulting in an extra chdir of the make process
# Create symlinks to work around it
- symlink "../$_", "obj/$_" for qw/bin modules obj/;
+ symlink "../$_", "obj/$_" for qw/bin coremods modules obj/;
$build = getcwd();
open MAKE, '>real.mk' or die "Could not write real.mk: $!";
\@echo "in order to set the correct environment variables"
\@exit 1
-all: inspircd commands modules
+all: inspircd coremods modules
END
- my(@core_deps, @cmdlist, @modlist);
+ my(@core_deps, @cmodlist, @modlist);
for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
my $out = find_output $file;
- dep_cpp $file, $out;
- next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+ dep_cpp $file, $out, 'gen-o';
+ next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
push @core_deps, $out;
}
- for my $file (<commands/*.cpp>) {
- my $out = find_output $file;
- dep_cpp $file, $out;
- push @cmdlist, $out;
+ opendir my $coremoddir, 'coremods';
+ for my $file (sort readdir $coremoddir) {
+ next if $file =~ /^\./;
+ if ($file =~ /^core_/ && -d "coremods/$file" && dep_dir "coremods/$file", "modules/$file") {
+ mkdir "$build/obj/$file";
+ push @cmodlist, "modules/$file.so";
+ }
+ if ($file =~ /^core_.*\.cpp$/) {
+ my $out = dep_so "coremods/$file";
+ push @cmodlist, $out;
+ }
}
opendir my $moddir, 'modules';
rename "modules/$file", "modules/$file~";
symlink "extra/$file", "modules/$file";
}
- if ($file =~ /^m_/ && -d "modules/$file" && dep_dir "modules/$file") {
+ if ($file =~ /^m_/ && -d "modules/$file" && dep_dir "modules/$file", "modules/$file") {
mkdir "$build/obj/$file";
push @modlist, "modules/$file.so";
}
if ($file =~ /^m_.*\.cpp$/) {
- my $out = find_output "modules/$file";
- dep_cpp "modules/$file", $out;
+ my $out = dep_so "modules/$file";
push @modlist, $out;
}
}
my $core_mk = join ' ', @core_deps;
- my $cmds = join ' ', @cmdlist;
+ my $cmods = join ' ', @cmodlist;
my $mods = join ' ', @modlist;
print MAKE <<END;
bin/inspircd: $core_mk
- \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+ @\$(SOURCEPATH)/make/unit-cc.pl core-ld\$(VERBOSE) \$\@ \$^ \$>
inspircd: bin/inspircd
-commands: $cmds
+coremods: $cmods
modules: $mods
-.PHONY: inspircd commands modules
+.PHONY: all bad-target inspircd coremods modules
END
}
all: inspircd
END
- my @deps;
- for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <commands/*.cpp>,
+ my(@deps, @srcs);
+ for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <coremods/*.cpp>, <coremods/core_*/*.cpp>,
<modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") {
my $out = find_output $file, 1;
- dep_cpp $file, $out;
- next if $file =~ m#^socketengines/# && $file ne "socketengines/$ENV{SOCKETENGINE}.cpp";
+ if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
+ mkdir "$ENV{BUILDPATH}/obj/$1";
+ }
+ dep_cpp $file, $out, 'gen-o';
+ next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
push @deps, $out;
+ push @srcs, $file;
}
my $core_mk = join ' ', @deps;
+ my $core_src = join ' ', @srcs;
print MAKE <<END;
-bin/inspircd: $core_mk
- \$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+obj/ld-extra.cmd: $core_src
+ \@\$(SOURCEPATH)/make/unit-cc.pl gen-ld\$(VERBOSE) \$\@ \$^ \$>
+
+bin/inspircd: obj/ld-extra.cmd $core_mk
+ \@\$(SOURCEPATH)/make/unit-cc.pl static-ld\$(VERBOSE) \$\@ \$^ \$>
inspircd: bin/inspircd
sub find_output {
my($file, $static) = @_;
my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
- if ($path eq 'modules/' || $path eq 'commands/') {
+ if ($path eq 'modules/' || $path eq 'coremods/') {
return $static ? "obj/$base.o" : "modules/$base.so";
} elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) {
return "obj/$base.o";
- } elsif ($path =~ m#modules/(m_.*)/#) {
+ } elsif ($path =~ m#modules/(m_.*)/# || $path =~ m#coremods/(core_.*)/#) {
return "obj/$1/$base.o";
} else {
die "Can't determine output for $file";
while (<$in>) {
if (/^\s*#\s*include\s*"([^"]+)"/) {
my $inc = $1;
- next if $inc eq 'inspircd_version.h' && $f eq '../include/inspircd.h';
+ next if $inc eq 'config.h' && $f eq '../include/inspircd.h';
my $found = 0;
for my $loc ("$basedir/$inc", "../include/$inc") {
next unless -e $loc;
$f2dep{$f};
}
-sub dep_cpp($$) {
- my($file, $out) = @_;
+sub dep_cpp($$$) {
+ my($file, $out, $type) = @_;
gendep $file;
print MAKE "$out: $file $f2dep{$file}\n";
- print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$\@ \$< \$>\n";
+ print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl $type\$(VERBOSE) \$\@ \$(SOURCEPATH)/src/$file \$>\n";
+}
+
+sub dep_so($) {
+ my($file) = @_;
+ my $out = find_output $file;
+
+ dep_cpp $file, $out, 'gen-so';
+ return $out;
}
-sub dep_dir($) {
- my($dir) = @_;
+sub dep_dir($$) {
+ my($dir, $outdir) = @_;
my @ofiles;
opendir DIR, $dir;
for my $file (sort readdir DIR) {
next unless $file =~ /(.*)\.cpp$/;
my $ofile = find_output "$dir/$file";
- dep_cpp "$dir/$file", $ofile;
+ dep_cpp "$dir/$file", $ofile, 'gen-o';
push @ofiles, $ofile;
}
closedir DIR;
if (@ofiles) {
my $ofiles = join ' ', @ofiles;
- print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^ \$>\n";
+ print MAKE "$outdir.so: $ofiles\n";
+ print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir\$(VERBOSE) \$\@ \$^ \$>\n";
return 1;
} else {
return 0;