X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcalcdep.pl;h=1a1963b3102c9ac5ff5c79c9179d47400d690238;hb=988784816b1a21b20da99a20c8ca02de793000fd;hp=484c98cbd86079a12850f0a84039afd878cdd226;hpb=eb910456e2f01255f277fe060fef6f7dd3018cf7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 484c98cbd..1a1963b31 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -1,27 +1,184 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Getopt::Long;
+use POSIX qw(getcwd);
+
+sub find_output;
+sub gendep($);
+sub dep_cpp($$);
+sub dep_dir($);
+sub run();
 
 my %f2dep;
 
-sub gendep;
-sub gendep {
+run;
+exit 0;
+
+sub run() {
+	my $build = $ENV{BUILDPATH};
+	mkdir $build;
+	chdir $build or die "Could not open build directory: $!";
+	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/;
+
+	$build = getcwd();
+	open MAKE, '>real.mk' or die "Could not write real.mk: $!";
+	chdir "$ENV{SOURCEPATH}/src";
+
+	if ($ENV{PURE_STATIC}) {
+		run_static();
+	} else {
+		run_dynamic();
+	}
+	close MAKE;
+}
+
+sub run_dynamic() {
+	my $build = $ENV{BUILDPATH};
+	print MAKE <<END;
+# DO NOT EDIT THIS FILE
+# It is autogenerated by make/calcdep.pl, and will be overwritten
+# every time you rerun make in the main directory
+VPATH = \$(SOURCEPATH)/src
+
+bad-target:
+	\@echo "This Makefile must be run by a sub-make from the source"
+	\@echo "in order to set the correct environment variables"
+	\@exit 1
+
+all: inspircd commands modules
+
+END
+	my(@core_deps, @cmdlist, @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";
+		push @core_deps, $out;
+	}
+
+	for my $file (<commands/*.cpp>) {
+		my $out = find_output $file;
+		dep_cpp $file, $out;
+		push @cmdlist, $out;
+	}
+
+	opendir my $moddir, 'modules';
+	for my $file (sort readdir $moddir) {
+		next if $file =~ /^\./;
+		if (-e "modules/extra/$file" && !-l "modules/$file") {
+			# Incorrect symlink?
+			print "Replacing symlink for $file found in modules/extra\n";
+			rename "modules/$file", "modules/$file~";
+			symlink "extra/$file", "modules/$file";
+		}
+		if ($file =~ /^m_/ && -d "modules/$file" && dep_dir "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;
+			push @modlist, $out;
+		}
+	}
+	
+	my $core_mk = join ' ', @core_deps;
+	my $cmds = join ' ', @cmdlist;
+	my $mods = join ' ', @modlist;
+	print MAKE <<END;
+
+bin/inspircd: $core_mk
+	\$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+
+inspircd: bin/inspircd
+
+commands: $cmds
+
+modules: $mods
+
+.PHONY: all bad-target inspircd commands modules
+
+END
+}
+
+sub run_static() {
+	print MAKE <<END;
+# DO NOT EDIT THIS FILE
+# It is autogenerated by make/calcdep.pl, and will be overwritten
+# every time you rerun make in the main directory
+VPATH = \$(SOURCEPATH)/src
+
+bad-target:
+	\@echo "This Makefile must be run by a sub-make from the source"
+	\@echo "in order to set the correct environment variables"
+	\@exit 1
+
+all: inspircd
+
+END
+	my @deps;
+	for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, <commands/*.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";
+		push @deps, $out;
+	}
+
+	my $core_mk = join ' ', @deps;
+	print MAKE <<END;
+
+bin/inspircd: $core_mk
+	\$(RUNCC) -o \$\@ \$(CORELDFLAGS) \$(LDLIBS) \$^ \$>
+
+inspircd: bin/inspircd
+
+.PHONY: all bad-target inspircd
+
+END
+}
+
+sub find_output {
+	my($file, $static) = @_;
+	my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
+	if ($path eq 'modules/' || $path eq 'commands/') {
+		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_.*)/#) {
+		return "obj/$1/$base.o";
+	} else {
+		die "Can't determine output for $file";
+	}
+}
+
+sub gendep($) {
 	my $f = shift;
 	my $basedir = $f =~ m#(.*)/# ? $1 : '.';
 	return $f2dep{$f} if exists $f2dep{$f};
 	$f2dep{$f} = '';
 	my %dep;
+	my $link = readlink $f;
+	if (defined $link) {
+		$link = "$basedir/$link" unless $link =~ m#^/#;
+		$dep{$link}++;
+	}
 	open my $in, '<', $f or die "Could not read $f";
 	while (<$in>) {
 		if (/^\s*#\s*include\s*"([^"]+)"/) {
 			my $inc = $1;
+			next if $inc eq 'inspircd_version.h' && $f eq '../include/inspircd.h';
 			my $found = 0;
 			for my $loc ("$basedir/$inc", "../include/$inc") {
 				next unless -e $loc;
 				$found++;
-				$dep{$loc}++;
 				$dep{$_}++ for split / /, gendep $loc;
+				$loc =~ s#^\.\./##;
+				$dep{$loc}++;
 			}
 			if ($found == 0 && $inc ne 'inspircd_win32wrapper.h') {
 				print STDERR "WARNING: could not find header $inc for $f\n";
@@ -35,74 +192,31 @@ sub gendep {
 	$f2dep{$f};
 }
 
-sub dep_cpp {
-	my $file = shift;
+sub dep_cpp($$) {
+	my($file, $out) = @_;
 	gendep $file;
-	my($path,$base) = $file =~ m#^((?:.*/)?)([^/]+)\.cpp# or die "Bad file $file";
-	my $cmd = "$path.$base.d";
-	my $ext = $path eq 'modules/' || $path eq 'commands/' ? '.so' : '.o';
-	my $out = "$path$base$ext";
-
-	open OUT, '>', $cmd;
-	print OUT "$out: $file $f2dep{$file}\n";
-	print OUT "\t@../make/unit-cc.pl \$(VERBOSE) $file $out\n";
-	print OUT "$cmd: $file $f2dep{$file}\n";
-	print OUT "\t../make/calcdep.pl -file $file\n";
-}
-
-sub dep_dir {
-	my $dir = shift;
-	if ($dir =~ m#^(.*?)([^/]+)/?$#) {
-		my($path,$base) = ($1,$2);
-		my $cmd = "$path.$base.d";
-		my $out = "$path$base.so";
-		opendir DIR, $dir;
-		my $ofiles = join ' ', grep s/(.*)\.cpp$/$path$base\/$1.o/, readdir DIR;
-		closedir DIR;
-		open OUT, '>', $cmd;
-		print OUT "$out: $ofiles\n\t".'$(RUNCC) $(PICLDFLAGS) -o $@ '
-			.$ofiles."\n";
-		print OUT "$cmd: $dir\n\t".'@../make/calcdep.pl -file '."$path$base\n";
-	} else {
-		print STDERR "Cannot generate depencency for $dir\n";
-		exit 1;
-	}
-}
 
-my($all,$quiet, $file);
-GetOptions(
-	'all' => \$all,
-	'quiet' => \$quiet,
-	'file=s' => \$file,
-);
-
-if (!$all && !defined $file) {
-	print "Use: $0 {-all|-file filename} [-quiet]\n";
-	exit 1;
+	print MAKE "$out: $file $f2dep{$file}\n";
+	print MAKE "\t@\$(SOURCEPATH)/make/unit-cc.pl \$(VERBOSE) \$\@ \$< \$>\n";
 }
 
-if (defined $file) {
-	if (-f $file) {
-		dep_cpp $file;
-	} elsif (-d $file) {
-		dep_dir $file;
-	} else {
-		print STDERR "Can't generate dependencies for $file\n";
-		exit 1;
+sub dep_dir($) {
+	my($dir) = @_;
+	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;
+		push @ofiles, $ofile;
 	}
-} else {
-	my @files = (<*.cpp>, <commands/*.cpp>, <modes/*.cpp>, <modules/*.cpp>, <modules/m_*/*.cpp>);
-	push @files, "socketengines/$ENV{SOCKETENGINE}.cpp", "threadengines/threadengine_pthread.cpp";
-	for my $file (@files) {
-		dep_cpp $file;
-	}
-
-	my @dirs = grep -d, <modules/m_*>;
-	for my $dir (@dirs) {
-		dep_dir $dir;
+	closedir DIR;
+	if (@ofiles) {
+		my $ofiles = join ' ', @ofiles;
+		print MAKE "$dir.so: $ofiles\n\t\$(RUNCC) \$(PICLDFLAGS) -o \$\@ \$^ \$>\n";
+		return 1;
+	} else {
+		return 0;
 	}
-
-	s#([^/]+)\.cpp#.$1.d# for @files;
-	s#([^/]+)/?$#.$1.d# for @dirs;
-	print join ' ', @files, @dirs;
 }
+