Provide unoidl-write also for the SDK

...after the new types.rdb format that unoidl-write generates has been used
internally since LibreOffice 4.1 in 2013; following up on
6db34b6b33ba8e3b13683efd05df8441b87e9c92 "Directly build UNOIDL .rdb files from
.idl files" and its "The legacy tools idlc, regcompare, regmerge, and regview
are still contained in the URE or SDK for now."

The tools idlc and regmerge are deprecated but still shipped in the SDK for now.
The plan is to drop them completely for LO 7.5.

odk/examples/ and ure/source/uretest/ are adapted to use unoidl-write instead of
idlc and regmerge:

* unoidl-write does not use a C preprocessor and the # directives in .idl files,
it supports reading a single .idl file (containing an arbitrary number of
declarations) or a directory tree where each directory corresponds to a UNOIDL
module of the same name and each .idl file contains the declaration of the
(non-module) UNOIDL entity of the same name.  For some of the odk/examples/,
that required moving individual .idl files into sub-directories named after
the respective modules.  In odk/settings/std.mk, definitinos of IDL and
REGMERGE have been replaced with a new UNOIDLWRITE.

* unoidl-write always enforces reserved UNOIDL identifier restrictions (see
04af4e4f55f3ef319a78edd4d0109e2e7eba90b6 "[API CHANGE] Fix all bad UNOIDL
identifiers across offapi" and 620179240670bd00f60555f1f5c5b0268492f97c
"Enforce the UNOIDL identifier scheme") (which idlc only enforced optionally
with -cid -we).  That required renaming "my_module" in
odk/examples/DevelopersGuide/Components/CppComponent/.

* The new types.rdb format is not compatibly with LibreOffice < 4.1.  Clients
generating extensions containing such files are advised to use appropriate
LibreOffice-minimal-version elements.

Change-Id: I1a248fd96e86ecbf407f829bc100d44bfe7f4e7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130533
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 8 insertions, 18 deletions

diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index ebfcd4bb96cf..1ba97fd79593 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -266,11 +266,8 @@ out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class
 	touch $@
 
 
-out.sdk/types.rdb: out.sdk/types.urd | out.sdk
-	$(REGMERGE) $@ /UCR $<
-
-out.sdk/types.urd: types.idl | out.sdk
-	$(IDLC) -O$(@D) -I$(IDL_DIR) -cid -we $<
+out.sdk/types.rdb: types.idl | out.sdk
+	$(UNOIDLWRITE) $(URE_TYPES) $< $@
 
 
 out.sdk/services.rdb: services.rdb.in | out.sdk/cpptest.uno.$(SHAREDLIB_EXT) \
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 990c32bf5771..37025d7acb39 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -30,11 +30,7 @@ URE_HOME ?= /opt/libreoffice
 
 
 .PHONY: check
-check: test-regview test-cpptest test-javatest test-javanative test-clientserver
-
-.PHONY: test-regview
-test-regview: out.pln/types.rdb
-	$(URE_HOME)/program/regview $< > /dev/null
+check: test-cpptest test-javatest test-javanative test-clientserver
 
 .PHONY: test-cpptest
 test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb
@@ -247,12 +243,9 @@ out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
 	touch $@
 
 
-out.pln/types.rdb: out.pln/types.urd | out.pln
-	$(URE_HOME)/program/regmerge $@ /UCR $<
-
-out.pln/types.urd: types.idl | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/idlc -O$(@D) \
-            -I$(SDK_HOME)/idl -cid -we $<
+out.pln/types.rdb: types.idl | out.pln
+	LD_LIBRARY_PATH=$(URE_HOME)/program $(SDK_HOME)/bin/unoidl-write \
+            $(URE_HOME)/program/types.rdb $< $@
 
 
 out.pln/services.rdb: services.rdb.in | out.pln/cpptest.uno.so \
diff --git a/ure/source/uretest/README b/ure/source/uretest/README
index 2699156a5e59..c4ef98332738 100644
--- a/ure/source/uretest/README
+++ b/ure/source/uretest/README
@@ -43,8 +43,8 @@ environment variables:
 
 - SDK_HOME
 Points to the base directory of an OpenOffice.org SDK so that you can access UNO
-programming tools and files that are not part of the URE.  For example, idlc,
-cppumaker, javamaker, UNOIDL files, and C++ headers.
+programming tools and files that are not part of the URE.  For example, unoidl-write,
+cppumaker, javamaker, and C++ headers.
 
 - PATH
 Points to a GCC installation (including g++) as well as a JDK installation that