svn commit: samba r12680 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-01-02 21:41:15 +0000 (Mon, 02 Jan 2006)
New Revision: 12680

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12680

Log:
Support setting the environment variable SMB_BUILD_VERBOSE to 
print out more debug info

Modified:
   branches/SAMBA_4_0/source/build/smb_build/dot.pl
   branches/SAMBA_4_0/source/build/smb_build/input.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/dot.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/dot.pl	2006-01-02 18:25:30 UTC (rev 12679)
+++ branches/SAMBA_4_0/source/build/smb_build/dot.pl	2006-01-02 21:41:15 UTC (rev 12680)
@@ -22,7 +22,7 @@
 }
 
 my $INPUT = {};
-smb_build::config_mk::run_config_mk($INPUT, "main.mk");
+smb_build::config_mk::run_config_mk($INPUT, '.', "main.mk");
 
 print __FILE__.": creating samba4-deps.dot\n";
 open DOTTY, ">samba4-deps.dot";

Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm	2006-01-02 18:25:30 UTC (rev 12679)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm	2006-01-02 21:41:15 UTC (rev 12680)
@@ -114,21 +114,28 @@
 	$bin->{OUTPUT_TYPE} = "BINARY";
 }
 
-sub calc_unique_deps($$)
+my $level = "";
+
+sub calc_unique_deps($$$)
 {
-	sub calc_unique_deps($$);
-	my ($deps, $udeps) = @_;
+	sub calc_unique_deps($$$);
+	my ($name, $deps, $udeps) = @_;
 
+	print "$level-> $name\n" if ($ENV{SMB_BUILD_VERBOSE});
+	$level.=" ";
+
 	foreach my $dep (@{$deps}) {
 		if (not defined($udeps->{$$dep->{NAME}})) {
       		   if (defined ($$dep->{OUTPUT_TYPE}) && (($$dep->{OUTPUT_TYPE} eq "OBJ_LIST")
 			    or ($$dep->{OUTPUT_TYPE} eq "MERGEDOBJ"))) {
    			        $udeps->{$$dep->{NAME}} = "BUSY";
-			        calc_unique_deps($$dep->{DEPENDENCIES}, $udeps);
+			        calc_unique_deps($$dep->{NAME}, $$dep->{DEPENDENCIES}, $udeps);
 		        }
 			$udeps->{$$dep->{NAME}} = $$dep;
 		}
 	}
+	
+	$level = substr($level, 1);
 }
 
 sub check($$$$$)
@@ -185,7 +192,7 @@
 
 	foreach my $part (values %depend) {
 		$part->{UNIQUE_DEPENDENCIES} = {};
-		calc_unique_deps($part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
+		calc_unique_deps($part->{NAME}, $part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
 	}
 
 	return \%depend;