[ABI CHANGE] In SDK, replace regcompare with unoidl-check

...as the latter was the more flexible replacement for the former for LO-
internal use already.  The only gotcha to watch out for is that unoidl-check
cannot be used to check "naked" .urd files, but only ones where the content has
been moved to /UCR via regmerge.

Leave registry/CustomTarget_regcompare_test.mk around to verify that
unoidl-check behaves the same as did regcompare on those old-format .urd/.rdb
files.

Change-Id: Ic13ede48535bf942126c810d88bac7e4081d984e

1 files changed, 111 insertions, 105 deletions

diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
index d0781db773bb..b584d3f9a795 100644
--- a/registry/CustomTarget_regcompare_test.mk
+++ b/registry/CustomTarget_regcompare_test.mk
@@ -22,114 +22,120 @@ $(eval $(call gb_CustomTarget_CustomTarget,registry/regcompare_test))
 .PHONY: $(call gb_CustomTarget_get_target,registry/regcompare_test)
 
 $(call gb_CustomTarget_get_target,registry/regcompare_test): \
-        $(call gb_Executable_get_runtime_dependencies,regcompare) \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd
+        $(call gb_Executable_get_runtime_dependencies,unoidl-check) \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb
 	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
-        && $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
-        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
-            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
-            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd) \
+        $(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 \
+            -- $(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)/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)/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)/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)/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)/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)/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)/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 \
+            -- $(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)/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)/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)/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)/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)/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)/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)/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)/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)/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 \
+            -- $(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)/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)/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)/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)/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)/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)/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)/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 \
+            -- $(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)/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)/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)/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)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
         > $@.log 2>&1 || (cat $@.log && false))
 
+$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.rdb: \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd \
+        $(call gb_Executable_get_runtime_dependencies,regmerge)
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,regmerge) $@ /UCR $<))
+
 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd: \
         $(SRCDIR)/registry/test/regcompare/%.idl \
         $(call gb_Executable_get_runtime_dependencies,idlc)