[Libreoffice-commits] core.git: registry/CustomTarget_regcompare_test.mk

[Stephan Bergmann]

 registry/CustomTarget_regcompare_test.mk |  186 ++++++++++++++++++++-----------
 1 file changed, 124 insertions(+), 62 deletions(-)

New commits:
commit 02888887be860cbd9963e5c2853ddd18cc5ce6e9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 4 16:28:24 2016 +0100

    Split long command line into multiple shorter ones
    
    ...maybe that makes Windows more happy
    
    Change-Id: I4fe1d73f5638e1efe07162735c94856e0541ae78

diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
index b584d3f..efdc070 100644
--- a/registry/CustomTarget_regcompare_test.mk
+++ b/registry/CustomTarget_regcompare_test.mk
@@ -34,98 +34,160 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \
 	$(call gb_Helper_abbreviate_dirs,( \
         $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-        && echo 1 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-        && echo 2 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-        && echo 3 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb \
-        && echo 4 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-        && echo 5 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-        && echo 6 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-        && echo 7 && ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
-        && echo 8 && $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-        && echo 9 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-        && echo 10 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-        && echo 11 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb \
-        && echo 12 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-        && echo 13 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-        && echo 14 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-        && echo 15 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
-        && echo 16 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-        && echo 17 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-        && echo 18 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-        && echo 19 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb \
-        && echo 20 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-        && echo 21 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-        && echo 22 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-        && echo 23 && $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
-        && echo 24 && $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-        && echo 25 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-        && echo 26 && $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-        && echo 27 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb \
-        && echo 28 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-        && echo 29 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-        && echo 30 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-        && echo 31 && ! $(call gb_Executable_get_command,unoidl-check) \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+	$(call gb_Helper_abbreviate_dirs,( \
+        ! $(call gb_Executable_get_command,unoidl-check) \
             $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
             -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
         > $@.log 2>&1 || (cat $@.log && false))