mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix naming of makefile to mend make dump-deps.

Browse Source 
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>
This commit is contained in:
Michael Meeks
2016-09-28 21:33:14 +01:00
committed by Noel Grandin
parent c9196b4996
commit d200c344cf
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/module-deps.pl
View File

@@ -234,11 +234,16 @@ sub collapse_lib_to_module($)
my @empty; my @empty;
$digraph{$name}{deps} = \@empty; $digraph{$name}{deps} = \@empty;
$digraph{$name}{target} = $result->{target}; $digraph{$name}{target} = $result->{target};
$digraph{$name}{merged} = $result->{merged}; $digraph{$name}{merged} = $result->{merged};
} }
} }
for my $dep (@{$result->{deps}}) { 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 # ignore: two libraries from the same module depend on each other
next if ($name eq $dep); next if ($name eq $dep);
if (exists($digraph{$name})) if (exists($digraph{$name}))
@@ -257,7 +262,7 @@ sub collapse_lib_to_module($)
push @deps, $dep; push @deps, $dep;
$digraph{$name}{deps} = \@deps; $digraph{$name}{deps} = \@deps;
$digraph{$name}{target} = $result->{target}; $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}) { for my $name (keys %{$tree}) {
if (defined $merged_libs{$name}) { if (defined $merged_libs{$name}) {
$tree->{$name}->{merged} = 1; $tree->{$name}->{merged} = 1;
print STDERR "mark $name as merged\n"; # print STDERR "mark $name as merged\n";
} }
} }
} }

0
test/Library_test-setupvcl.mk → test/Library_test_setupvcl.mk
View File

2
test/Module_test.mk
View File

@@ -13,7 +13,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,test,\ $(eval $(call gb_Module_add_targets,test,\
Library_test \ Library_test \
Library_test-setupvcl \ Library_test_setupvcl \
Library_subsequenttest \ Library_subsequenttest \
Library_vclbootstrapprotector \ Library_vclbootstrapprotector \
Package_unittest \ Package_unittest \