ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Integrate coremods into the build system

Browse Source
This commit is contained in:
Attila Molnar 2014-03-05 16:28:29 +01:00
parent 8de3635fab
commit 050c2cf253
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
make/calcdep.pl
View File

@ -27,7 +27,7 @@ sub find_output;
sub gendep($); sub gendep($);
sub dep_cpp($$$); sub dep_cpp($$$);
sub dep_so($); sub dep_so($);
sub dep_dir($); sub dep_dir($$);
sub run(); sub run();
my %f2dep; my %f2dep;
@ -44,7 +44,7 @@ sub run() {
mkdir $_ for qw/bin modules obj/; mkdir $_ for qw/bin modules obj/;
# BSD make has a horribly annoying bug resulting in an extra chdir of the make process # BSD make has a horribly annoying bug resulting in an extra chdir of the make process
# Create symlinks to work around it # Create symlinks to work around it
symlink "../$_", "obj/$_" for qw/bin modules obj/; symlink "../$_", "obj/$_" for qw/bin coremods modules obj/;
$build = getcwd(); $build = getcwd();
open MAKE, '>real.mk' or die "Could not write real.mk: $!"; open MAKE, '>real.mk' or die "Could not write real.mk: $!";
@ -71,10 +71,10 @@ bad-target:
\@echo "in order to set the correct environment variables" \@echo "in order to set the correct environment variables"
\@exit 1 \@exit 1
all: inspircd commands modules all: inspircd coremods modules
END END
my(@core_deps, @cmdlist, @modlist); my(@core_deps, @cmodlist, @modlist);
for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") { for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
my $out = find_output $file; my $out = find_output $file;
dep_cpp $file, $out, 'gen-o'; dep_cpp $file, $out, 'gen-o';
@ -82,9 +82,17 @@ END
push @core_deps, $out; push @core_deps, $out;
} }
for my $file (<commands/*.cpp>) { opendir my $coremoddir, 'coremods';
my $out = dep_so $file; for my $file (sort readdir $coremoddir) {
push @cmdlist, $out; 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'; opendir my $moddir, 'modules';
@ -96,7 +104,7 @@ END
rename "modules/$file", "modules/$file~"; rename "modules/$file", "modules/$file~";
symlink "extra/$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"; mkdir "$build/obj/$file";
push @modlist, "modules/$file.so"; push @modlist, "modules/$file.so";
} }
@ -107,7 +115,7 @@ END
} }
my $core_mk = join ' ', @core_deps; my $core_mk = join ' ', @core_deps;
my $cmds = join ' ', @cmdlist; my $cmods = join ' ', @cmodlist;
my $mods = join ' ', @modlist; my $mods = join ' ', @modlist;
print MAKE <<END; print MAKE <<END;
@ -116,11 +124,11 @@ bin/inspircd: $core_mk
inspircd: bin/inspircd inspircd: bin/inspircd
commands: $cmds coremods: $cmods
modules: $mods modules: $mods
.PHONY: all bad-target inspircd commands modules .PHONY: all bad-target inspircd coremods modules
END END
} }
@ -141,7 +149,7 @@ all: inspircd
END END
my(@deps, @srcs); my(@deps, @srcs);
for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <commands/*.cpp>, for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <coremods/*.cpp>, <coremods/core_*/*.cpp>,
<modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") { <modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") {
my $out = find_output $file, 1; my $out = find_output $file, 1;
if ($out =~ m#obj/([^/]+)/[^/]+.o$#) { if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
@ -173,11 +181,11 @@ END
sub find_output { sub find_output {
my($file, $static) = @_; my($file, $static) = @_;
my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file"; 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"; return $static ? "obj/$base.o" : "modules/$base.so";
} elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) { } elsif ($path eq '' || $path eq 'modes/' || $path =~ /^[a-z]+engines\/$/) {
return "obj/$base.o"; return "obj/$base.o";
} elsif ($path =~ m#modules/(m_.*)/#) { } elsif ($path =~ m#modules/(m_.*)/# || $path =~ m#coremods/(core_.*)/#) {
return "obj/$1/$base.o"; return "obj/$1/$base.o";
} else { } else {
die "Can't determine output for $file"; die "Can't determine output for $file";
@ -243,8 +251,8 @@ sub dep_so($) {
return $out; return $out;
} }
sub dep_dir($) { sub dep_dir($$) {
my($dir) = @_; my($dir, $outdir) = @_;
my @ofiles; my @ofiles;
opendir DIR, $dir; opendir DIR, $dir;
for my $file (sort readdir DIR) { for my $file (sort readdir DIR) {
@ -256,7 +264,7 @@ sub dep_dir($) {
closedir DIR; closedir DIR;
if (@ofiles) { if (@ofiles) {
my $ofiles = join ' ', @ofiles; my $ofiles = join ' ', @ofiles;
print MAKE "$dir.so: $ofiles\n"; print MAKE "$outdir.so: $ofiles\n";
print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir\$(VERBOSE) \$\@ \$^ \$>\n"; print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl link-dir\$(VERBOSE) \$\@ \$^ \$>\n";
return 1; return 1;
} else { } else {

2
make/unit-cc.pl
View File

@ -99,7 +99,7 @@ sub do_compile {
if ($do_compile) { if ($do_compile) {
$flags = $ENV{CORECXXFLAGS} . ' ' . get_property($file, 'CompileFlags'); $flags = $ENV{CORECXXFLAGS} . ' ' . get_property($file, 'CompileFlags');
if ($file =~ m#(?:^|/)((?:m|cmd)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) { if ($file =~ m#(?:^|/)((?:m|core)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
$flags .= ' -DMODNAME=\\"'.$1.'\\"'; $flags .= ' -DMODNAME=\\"'.$1.'\\"';
} }
} else { } else {