Directly build UNOIDL .rdb files from .idl files

...via unoidl-write and the new source-format registry provicers, instead of
using idlc to produce .urd files, regmerge to merge them into legacy .rdb files,
and unoidl-write to translate those to new UNOIDL .rdb files.

gb_UnoApi and gb_InternalUnoApi ctors take an additional argument now that is
the path (below $(SRCDIR)) of the source-format registry from which to obtain
UNOIDL entity definitions.  It can either be an .idl file (in which case no
*_add_idlfiles calls should be used and the resulting .rdb will contain all the
entities from that one .idl file; used in some tests to conveniently define all
test-specific entities in a single file) or a directory denoting the root of an
.idl file tree (in which case *_add_idlfiles calls specify the entites to
include in the resulting .idl file).  (In the first case, the generated .rdb
file needs to depend on that single .idl file, so the gb_UnoApiTarget ctor
contains a dependency on that additional argument, which happens, as a side
effect, to trigger rebuilds in the second, tree-based case when addition/removal
of .idl files in the tree causes updates of directory time-stamps.)

UnoApiPartTarget and all the dependency-tracking logic based on .urd files in
solenv/gbuild/UnoApiTarget.mk is gone.  Generation of an .rdb file now depends
on its source registry (see previous paragraph) and all the .idl files specified
with *_add_idlfiles (in the second, tree-based case above).

A consequence of that is that gb_UnoApi_add_idlfile, -_nohdl, and -_noheader all
do the same now.  I left them in for now anyway, maybe they become relevant
again when the use of cppumaker is changed to read directly from a source-format
registry instead of going via a .rdb registry.

The legacy tools idlc, regcompare, regmerge, and regview are still contained in
the URE or SDK for now.

cb344cd5 "Revert 'Looks like idlc resolved
typedefs inside sequence<...>'" is re-reverted as now "the current offapi.rdb is
generated via unoidl-write instead of idlc."

Change-Id: I3d9d92f17326bc9f49dd934c85aab6a17951d06d

RepositoryModule_build.mk

@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 	i18nutil \
 	i18npool \
 	idl \
-	idlc \
 	io \
 	javaunohelper \
 	jurt \

cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk

@@ -7,19 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_cppumaker_types))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_cppumaker_types,cppu/qa/cppumaker/types.idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,cppu_qa_cppumaker_types,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_cppumaker_types,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_cppumaker_types,cppu/qa/cppumaker,\
-    types \
-))
-
 # vim:set noet sw=4 ts=4:

cppu/InternalUnoApi_cppu_qa_types.mk

@@ -7,19 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_types))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_types,cppu/qa/types.idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,cppu_qa_types,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_types,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_types,cppu/qa,\
-    types \
-))
-
 # vim:set noet sw=4 ts=4:

cppuhelper/InternalUnoApi_cppuhelper.mk

@@ -7,18 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppuhelper))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppuhelper,cppuhelper/unotypes))
 
 $(eval $(call gb_InternalUnoApi_use_api,cppuhelper,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,cppuhelper,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/unotypes/cppuhelper/detail,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/detail,\
     XExceptionThrower \
 ))
 

jurt/InternalUnoApi_test_urp.mk

@@ -7,19 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,test_urp,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,test_urp,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp,\
-	interfaces \
-))
-
 # vim: set noet sw=4 ts=4:

offapi/type_reference/offapi.idl

@@ -2429,7 +2429,7 @@ module com {
       [property, maybevoid] ::com::sun::star::util::Color InactiveSelectionBackgroundColor;
       [property, maybevoid] ::com::sun::star::util::Color ActiveSelectionTextColor;
       [property, maybevoid] ::com::sun::star::util::Color InactiveSelectionTextColor;
-      [property, maybevoid] sequence< long > RowBackgroundColors;
+      [property, maybevoid] sequence< ::com::sun::star::util::Color > RowBackgroundColors;
       [property] ::com::sun::star::style::VerticalAlignment VerticalAlign;
       [property] ::com::sun::star::awt::FontDescriptor FontDescriptor;
       [property, maybevoid] ::com::sun::star::util::Color TextColor;
@@ -2848,8 +2848,10 @@ module com {
      CONTROL = 2,
      SYMMETRIC = 3
     };
-    published typedef sequence< sequence< ::com::sun::star::drawing::PolygonFlags > > FlagSequenceSequence;
-    published typedef sequence< sequence< ::com::sun::star::awt::Point > > PointSequenceSequence;
+    published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
+    published typedef sequence< ::com::sun::star::drawing::FlagSequence > FlagSequenceSequence;
+    published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
+    published typedef sequence< ::com::sun::star::drawing::PointSequence > PointSequenceSequence;
     published struct PolyPolygonBezierCoords {
      ::com::sun::star::drawing::PointSequenceSequence Coordinates;
      ::com::sun::star::drawing::FlagSequenceSequence Flags;
@@ -5219,7 +5221,7 @@ module com {
      interface ::com::sun::star::drawing::XControlShape;
     };
     published typedef sequence< long > CoordinateSequence;
-    published typedef sequence< sequence< long > > CoordinateSequenceSequence;
+    published typedef sequence< ::com::sun::star::drawing::CoordinateSequence > CoordinateSequenceSequence;
     published service DashTable {
      interface ::com::sun::star::container::XNameContainer;
     };
@@ -5281,7 +5283,7 @@ module com {
      [property, optional] boolean ParagraphSummation;
     };
     published typedef sequence< double > DoubleSequence;
-    published typedef sequence< sequence< double > > DoubleSequenceSequence;
+    published typedef sequence< ::com::sun::star::drawing::DoubleSequence > DoubleSequenceSequence;
     published interface XShapes;
     published interface XShapeBinder {
      interface ::com::sun::star::uno::XInterface;
@@ -5533,7 +5535,6 @@ module com {
      HORIZONTAL = 5,
      VERTICAL = 6
     };
-    published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
     /** @deprecated */ published struct GluePoint {
      ::com::sun::star::awt::Point Position;
      short EscapeDirection;
@@ -5721,7 +5722,6 @@ module com {
      [property] string PluginURL;
      [property] sequence< ::com::sun::star::beans::PropertyValue > PluginCommands;
     };
-    published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
     published service PolyLineShape {
      service ::com::sun::star::drawing::Shape;
      service ::com::sun::star::drawing::LineProperties;
@@ -14164,7 +14164,7 @@ module com {
     published interface XDefaultNumberingProvider {
      interface ::com::sun::star::uno::XInterface;
      sequence< ::com::sun::star::container::XIndexAccess > getDefaultOutlineNumberings([in] ::com::sun::star::lang::Locale aLocale);
-     sequence< sequence< ::com::sun::star::beans::PropertyValue > > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
+     sequence< ::com::sun::star::beans::PropertyValues > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
     };
     published service DefaultNumberingProvider: ::com::sun::star::text::XDefaultNumberingProvider;
     published service Defaults {
@@ -15347,8 +15347,8 @@ module com {
     };
     published interface XRubySelection {
      interface ::com::sun::star::uno::XInterface;
-     sequence< sequence< ::com::sun::star::beans::PropertyValue > > getRubyList([in] boolean Automatic);
-     void setRubyList([in] sequence< sequence< ::com::sun::star::beans::PropertyValue > > RubyList, [in] boolean Automatic);
+     sequence< ::com::sun::star::beans::PropertyValues > getRubyList([in] boolean Automatic);
+     void setRubyList([in] sequence< ::com::sun::star::beans::PropertyValues > RubyList, [in] boolean Automatic);
     };
     published interface XTextCopy {
      interface ::com::sun::star::uno::XInterface;
@@ -15371,7 +15371,7 @@ module com {
       [property] boolean IsSortByPosition;
       [property] string BracketBefore;
       [property] string BracketAfter;
-      [property] sequence< sequence< ::com::sun::star::beans::PropertyValue > > SortKeys;
+      [property] sequence< ::com::sun::star::beans::PropertyValues > SortKeys;
       [property] ::com::sun::star::lang::Locale Locale;
       [property] string SortAlgorithm;
      };

oovbaapi/UnoApi_oovbaapi.mk

@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_UnoApi_UnoApi,oovbaapi))
+$(eval $(call gb_UnoApi_UnoApi,oovbaapi,oovbaapi))
 
 $(eval $(call gb_UnoApi_install,oovbaapi,$(gb_PROGRAMDIRNAME)/types/oovbaapi.rdb))
 
@@ -26,14 +26,7 @@ $(eval $(call gb_UnoApi_use_api,oovbaapi,\
     offapi \
 ))
 
-$(eval $(call gb_UnoApi_set_include,oovbaapi,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/oovbaapi \
-	-I$(SRCDIR)/offapi \
-	-I$(SRCDIR)/udkapi \
-))
-
-$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,ooo/vba/excel,\
 	Globals \
 	Hyperlink \
 	Range \
@@ -43,15 +36,15 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\
 	Worksheet \
 ))
 
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,ooo/vba,\
 	ControlProvider \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,ooo/vba/excel,\
 	Button \
 	Buttons \
 ))
 
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba,\
     FormShowConstants \
     VbAppWinStyle \
     VbCalendar \
@@ -96,7 +89,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XVBAToOOEventDescGen \
 	XWindowBase \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/access,\
     AcCloseSave \
     AcColorIndex \
     AcCommand \
@@ -151,7 +144,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\
     ProcKind \
     RefKind \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/adodb,\
     ADCPROP_ASYNCTHREADPRIORITY_ENUM \
     ADCPROP_AUTORECALC_ENUM \
     ADCPROP_UPDATECRITERIA_ENUM \
@@ -192,7 +185,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\
     StringFormatEnum \
     XactAttributeEnum \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/dao,\
     CollatingOrderEnum \
     CommitTransOptionsEnum \
     CursorDriverEnum \
@@ -219,7 +212,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\
     UpdateTypeEnum \
     WorkspaceTypeEnum \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/excel,\
     Constants \
 	XApplication \
 	XAxes \
@@ -485,7 +478,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\
 	XWorksheetFunction \
 	XWorksheets \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/msforms,\
     fmAction \
     fmAlignment \
     fmBackStyle \
@@ -560,7 +553,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\
 	XToggleButton \
 	XUserForm \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/office,\
     DocProperties \
     MailFormat \
     MsoAlertButtonType \
@@ -684,7 +677,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\
     MsoWizardMsgType \
     MsoZOrderCmd \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/powerpoint,\
     MsoAnimAccumulate \
     MsoAnimAdditive \
     MsoAnimAfterEffect \
@@ -755,11 +748,11 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\
     PpViewType \
     PpWindowState \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/stdole,\
     LoadPictureConstants \
     OLE_TRISTATE \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\
+$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/word,\
     WdAlertLevel \
     WdAnimation \
     WdArabicNumeral \

scaddins/InternalUnoApi_scaddins.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins,scaddins/idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,scaddins,\
     offapi \
@@ -18,14 +18,7 @@ $(eval $(call gb_InternalUnoApi_define_api_dependencies,scaddins,offapi,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,scaddins,\
-    -I$(SRCDIR)/scaddins/idl \
-    -I$(SRCDIR)/offapi \
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,scaddins/idl/com/sun/star/sheet/addin,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,com/sun/star/sheet/addin,\
     Analysis \
     DateFunctions \
     PricingFunctions \

solenv/bin/concat-deps.c

@@ -1015,11 +1015,6 @@ off_t size;
                     created_line = generate_phony_line(src_relative+10, "o");
                     rc = generate_phony_file(fn, created_line);
                 }
-                else if(strncmp(fn+work_dir_len+5, "UnoApiPartTarget/", 17) == 0)
-                {
-                    created_line = generate_phony_line(src_relative+17, "urd");
-                    rc = generate_phony_file(fn, created_line);
-                }
                 else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
                 {
                     created_line = generate_phony_line(src_relative+14, "");

solenv/gbuild/InternalUnoApi.mk

@@ -24,11 +24,9 @@ $(call gb_InternalUnoApi_get_clean_target,%) :
 		rm -f $(call gb_InternalUnoApi_get_target,$*))
 
 define gb_InternalUnoApi_InternalUnoApi
-$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2))
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 
-$(call gb_UnoApiTarget_set_root,$(1),UCR)
-
 $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
 $(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
@@ -80,9 +78,4 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(de
 
 endef
 
-define gb_InternalUnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1),$(2))
-
-endef
-
 # vim: set noet sw=4 ts=4:

solenv/gbuild/LinkTarget.mk

@@ -849,7 +849,6 @@ gb_BUILD_HELPER_LIBS := basegfx \
 	xmlreader \
 
 gb_BUILD_HELPER_TOOLS := cppumaker \
-	idlc \
 	regmerge \
 	rsc \
 	svidl \

solenv/gbuild/TargetLocations.mk

@@ -196,7 +196,6 @@ gb_UnoApiHeadersTarget_get_real_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/nor
 gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap).done
 gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive).done
 gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),normal).done
-gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
 gb_UnpackedTarball_get_dir = $(WORKDIR)/UnpackedTarball/$(1)
 gb_UnpackedTarball_get_pristine_dir = $(WORKDIR)/UnpackedTarball/$(1).org
 gb_UnpackedTarball_get_final_target = $(WORKDIR)/UnpackedTarball/$(1).update
@@ -334,8 +333,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
 	SdiTarget \
 	SrsPartTarget \
 	SrsTarget \
-	UnoApiTarget \
-	UnoApiPartTarget \
 ))
 
 # other getters

solenv/gbuild/UnoApi.mk

@@ -15,15 +15,13 @@ $(call gb_UnoApi_get_clean_target,%) :
 		rm -f $(call gb_UnoApi_get_target,$*))
 
 define gb_UnoApi_UnoApi
-$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2))
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
 $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
 $(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
 endif
 
-$(call gb_UnoApiTarget_set_root,$(1),UCR)
-
 $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
 $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
 $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
@@ -57,7 +55,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1
 endef
 
 define gb_UnoApi__add_idlfile
-$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2)),$(2))
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2).idl),$(2).idl)
 
 endef
 
@@ -68,72 +66,43 @@ gb_UnoApi__add_idlfile :=
 
 endif
 
-define gb_UnoApi__add_headerfile_impl
-$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
-
-endef
-
-# Note: the expression in 3rd arg of call of gb_UnoApi__add_headerfile_impl
-# removes the leftmost dir in the subpath .-)
-define gb_UnoApi__add_headerfile
-$(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$(words $(subst /, ,$(2))),$(subst /, ,$(2)))))
-
-endef
-
-define gb_UnoApi__add_idlfile_noheader
-$(call gb_UnoApi__add_idlfile,$(1),$(2).idl)
-
-endef
-
-define gb_UnoApi__add_idlfile_nohdl
-$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2))
-$(call gb_UnoApi__add_headerfile,$(1),$(2).hpp)
-
-endef
-
-define gb_UnoApi__add_idlfile_full
-$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2))
-$(call gb_UnoApi__add_headerfile,$(1),$(2).hdl)
-
-endef
-
 # For enum types, plain struct types, polymorphic struct type templates,
 # exception types, interface types, typedefs, and constant groups:
 define gb_UnoApi_add_idlfile
 $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
 
 endef
 
 define gb_UnoApi_add_idlfiles
 $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
 
 endef
 
 # For single-interface--based services and interface-based singletons:
 define gb_UnoApi_add_idlfile_nohdl
 $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
 
 endef
 
 define gb_UnoApi_add_idlfiles_nohdl
 $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
 
 endef
 
 # For accumulation-based services and service-based singletons:
 define gb_UnoApi_add_idlfile_noheader
 $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
-$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3))
+$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(3))
 
 endef
 
 define gb_UnoApi_add_idlfiles_noheader
 $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
-$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
+$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile,$(1),$(gb_UnoApiTarget_REG_$(1))/$(2)/$(idl)))
 
 endef
 
@@ -154,9 +123,4 @@ $(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
 
 endef
 
-define gb_UnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1),$(2))
-
-endef
-
 # vim: set noet sw=4 ts=4:

solenv/gbuild/extensions/pre_BuildTools.mk

@@ -19,13 +19,10 @@ gb_BUILD_TOOLS = \
 		gendict \
 		genindex_data \
 		helpex \
-		idlc \
 		idxdict \
 		javamaker \
 		makedepend \
 		propex \
-		regmerge \
-		regview \
 		rsc \
 		saxparser \
 		stringex \

testtools/InternalUnoApi_bridgetest.mk

@@ -7,19 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,bridgetest))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,bridgetest,testtools/source/bridgetest/idl/bridgetest.idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,bridgetest,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,bridgetest,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,bridgetest,testtools/source/bridgetest/idl,\
-    bridgetest \
-))
-
 # vim:set noet sw=4 ts=4:

testtools/InternalUnoApi_performance.mk

@@ -7,19 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,performance))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,performance,testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,performance,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,performance,\
-    -I$(SRCDIR)/udkapi \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,performance,testtools/source/bridgetest/idl/com/sun/star/test/performance,\
-    XPerformanceTest \
-))
-
 # vim:set noet sw=4 ts=4:

touch/InternalUnoApi_touch.mk

@@ -6,7 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,touch))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,touch,touch/idl))
 
 $(eval $(call gb_InternalUnoApi_use_api,touch,\
 	udkapi \
@@ -17,13 +17,7 @@ $(eval $(call gb_InternalUnoApi_define_api_dependencies,touch, \
 	udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,touch,\
-	-I$(SRCDIR)/touch/idl \
-	-I$(SRCDIR)/udkapi \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,touch,touch/idl/org/libreoffice/touch,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,touch,org/libreoffice/touch,\
 	Document \
 	XDocument \
 	XDocumentRenderCallback \

unoidl/README

@@ -18,15 +18,12 @@ files.)  unoidl::loadProvider transparently detects the registry format for a
 given URI and instantiates the corresponding provider implementation.
 
 Executable_unoidl-write is a helper tool to convert from any of the registry
-formats to the UNOIDL format.  It is currently used at build-time.  idlc still
-generates the old format, and any new-format files (used at build-time only, or
-included in installation sets in URE or program/types/ or as part of bundled
-extensions that are created during the build and not merely included as pre-
-built .oxt files) are explicitly generated via unoidl-write.  The SDK is still
-designed to generate old-format files exclusively (especially, any non-bundled
-extensions will only contain old-format files for now; that allows to modify the
-new format further without having to worry about compatibility with multiple
-versions of that format).
+formats to the UNOIDL format.  It is used at build-time to compile UNOIDL format
+.rdb files (that are used at build-time only, or included in installation sets
+in URE or program/types/ or as part of bundled extensions that are created
+during the build and not merely included as pre-built .oxt files) from source
+.idl files.  (The SDK still uses idlc and generates legacy format .rdb files for
+now.)
 
 Executable_unoidl-read is a helper tool to convert from any of the registry
 formats to the source-file format.  It can be used manually after a LibreOffice