diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-09-28 21:33:14 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-29 06:48:31 +0000 |
| commit | d200c344cfd7bf25b6dc6cac5626728c3ef94fff (patch) | |
| tree | f5f7a573024af7c1bdab6e0cbd41e1a314f16388 /bin | |
| parent | c9196b4996377eecba6c06cd916f0e2268c1933d (diff) | |
Fix naming of makefile to mend make dump-deps.
Also add error message to make this more clear in the future.
Change-Id: Ic9e3a2c89119ef1ec3e6cc1074b7419f7ee268b7
Reviewed-on: https://gerrit.libreoffice.org/29375
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/module-deps.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/module-deps.pl b/bin/module-deps.pl index b99072213e3a..abec124e4abb 100755 --- a/bin/module-deps.pl +++ b/bin/module-deps.pl @@ -234,11 +234,16 @@ sub collapse_lib_to_module($) my @empty; $digraph{$name}{deps} = \@empty; $digraph{$name}{target} = $result->{target}; - $digraph{$name}{merged} = $result->{merged}; + $digraph{$name}{merged} = $result->{merged}; } } for my $dep (@{$result->{deps}}) { - $dep = $l2m->{$dep}; + my $newdep; + $newdep = $l2m->{$dep}; + + die "Mis-named */Library_*.mk file - should match rules: '$dep'" if (!defined $newdep); + $dep = $newdep; + # ignore: two libraries from the same module depend on each other next if ($name eq $dep); if (exists($digraph{$name})) @@ -257,7 +262,7 @@ sub collapse_lib_to_module($) push @deps, $dep; $digraph{$name}{deps} = \@deps; $digraph{$name}{target} = $result->{target}; - $digraph{$name}{merged} = $result->{merged}; + $digraph{$name}{merged} = $result->{merged}; } } } @@ -299,7 +304,7 @@ sub annotate_mergelibs($) for my $name (keys %{$tree}) { if (defined $merged_libs{$name}) { $tree->{$name}->{merged} = 1; - print STDERR "mark $name as merged\n"; +# print STDERR "mark $name as merged\n"; } } } |