[Libreoffice-commits] core.git: bin/module-deps.pl

[Michael Meeks]

 bin/module-deps.pl |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 499e53a95e79b175037ec9264d34e2ca6f7e692a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Mar 6 10:35:55 2013 +0000

    make debugging / cache better and kill a warning.

diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 904323b..8b7b887 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -11,8 +11,11 @@ sub read_deps()
     my $invalid_tolerance = 100;
     my $line_count = 0;
     my %deps;
-    open ($p, "ENABLE_PRINT_DEPS=1 $gnumake -n -f $makefile_build all|") || die "can't launch make: $!";
-#    open ($p, "/tmp/deps") || die "can't read deps: $!";
+    if (defined $ENV{DEP_CACHE_FILE}) {
+	open ($p, $ENV{DEP_CACHE_FILE}) || die "can't read deps from cache: $!";
+    } else {
+	open ($p, "ENABLE_PRINT_DEPS=1 $gnumake -n -f $makefile_build all|") || die "can't launch make: $!";
+    }
     $|=1;
     print STDERR "reading deps ";
     while (<$p>) {
@@ -94,6 +97,7 @@ sub has_child_dep($$$)
 }
 
 # flatten deps recursively into a single hash per module
+sub build_flat_dep_hash($$);
 sub build_flat_dep_hash($$)
 {
     my ($tree, $name) = @_;
@@ -115,8 +119,11 @@ sub build_flat_dep_hash($$)
     }
     $node->{flat_deps} = \%flat_deps;
 
-#    print "node '$name' has flat-deps: '" . join(',', keys %flat_deps) . "' " .
-#	  "vs. '" . join(',', @{$node->{deps}}) . "'\n";
+    # useful debugging ...
+    if (defined $ENV{DEP_CACHE_FILE}) {
+	print "node '$name' has flat-deps: '" . join(',', keys %flat_deps) . "' " .
+	    "vs. '" . join(',', @{$node->{deps}}) . "'\n";
+    }
 }
 
 # many modules depend on vcl + sal, but vcl depends on sal