[Libreoffice-commits] core.git: bin/module-deps.pl test/Library_test_setupvcl.mk test/Library_test-setupvcl.mk test/Module_test.mk

[Michael Meeks]

 bin/module-deps.pl            |   13 +++++++++----
 test/Library_test-setupvcl.mk |   37 -------------------------------------
 test/Library_test_setupvcl.mk |   37 +++++++++++++++++++++++++++++++++++++
 test/Module_test.mk           |    2 +-
 4 files changed, 47 insertions(+), 42 deletions(-)

New commits:
commit d200c344cfd7bf25b6dc6cac5626728c3ef94fff
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Sep 28 21:33:14 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index b990722..abec124 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";
     }
     }
 }
diff --git a/test/Library_test-setupvcl.mk b/test/Library_test_setupvcl.mk
similarity index 100%
rename from test/Library_test-setupvcl.mk
rename to test/Library_test_setupvcl.mk
diff --git a/test/Module_test.mk b/test/Module_test.mk
index 5e9bb15..e1051f1 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -13,7 +13,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
-    Library_test-setupvcl \
+    Library_test_setupvcl \
     Library_subsequenttest \
     Library_vclbootstrapprotector \
     Package_unittest \