refactor UnoApi class

6 files changed, 401 insertions, 257 deletions

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 3bce08d293d9..858045e7fd8e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -46,8 +46,8 @@ gb_PackagePart_get_target = $(OUTDIR)/$(1)
 gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
-gb_TypesRdb_get_outdir_target = $(OUTDIR)/rdb/$(1).rdb
-gb_UnoApiTarget_get_outdir_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb
 gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 # outdir targets: $(1) is path
@@ -119,10 +119,14 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
-gb_TypesRdb_get_target = $(WORKDIR)/TypesRdb/$(1).rdb
-gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).done
+gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive
+gb_UnoApiHeadersTarget_get_lightweight_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight
+gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal
+gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done
+gb_UnoApiHeadersTarget_get_lightweight_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight.done
+gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done
 gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
-gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is prefix/path
 gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
@@ -174,10 +178,10 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	SdiTarget \
 	SrsTarget \
 	SrsTemplateTarget \
-	TypesRdb \
 	CppunitTest \
 	CustomTarget \
 	ExternalLib \
+	UnoApiHeadersTarget \
 	UnoApiTarget \
 	WinResTarget \
 	YaccTarget \
@@ -195,6 +199,8 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	Executable \
 	Library \
 	StaticLibrary \
+	UnoApi \
+	UnoApiMerge \
 ))
 
 $(eval $(call gb_Helper_make_dep_targets,\
diff --git a/solenv/gbuild/TypesRdb.mk b/solenv/gbuild/TypesRdb.mk
deleted file mode 100644
index 9beb9218a07a..000000000000
--- a/solenv/gbuild/TypesRdb.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_TypesRdb_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
-gb_TypesRdb_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_TypesRdb_REGMERGETARGET)
-
-define gb_TypesRdb__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(2) $(3))) && \
-$(gb_TypesRdb_REGMERGECOMMAND) @$${RESPONSEFILE} && \
-rm -f $${RESPONSEFILE}
-endef
-
-define gb_TypesRdb__command
-$(call gb_Output_announce,$*,$(true),RDB,3)
-mkdir -p $(dir $(1)) && \
-$(if $(TYPESRDB_FILES),$(call gb_TypesRdb__command_impl,$(1),UCR,$(TYPESRDB_FILES)),true) && \
-$(if $(TYPESRDB_MERGE),$(call gb_TypesRdb__command_impl,$(1),/,$(TYPESRDB_MERGE)),true)
-endef
-
-$(call gb_TypesRdb_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@)
-
-$(call gb_TypesRdb_get_target,%) :
-	$(call gb_TypesRdb__command,$@,$*,$<,$?)
-
-.PHONY : $(call gb_TypesRdb_get_clean_target,%)
-$(call gb_TypesRdb_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),RDB,3)
-	$(call gb_Helper_convert_native,\
-		rm -f $(call gb_TypesRdb_get_target,$*) $(call gb_TypesRdb_get_outdir_target,$*))
-
-define gb_TypesRdb_TypesRdb
-$(call gb_TypesRdb_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_target,$(1))
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES :=
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE :=
-
-$(call gb_Deliver_add_deliverable,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_target,$(1)),$(1))
-
-$$(eval $$(call gb_Module_register_target,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_clean_target,$(1))))
-
-endef
-
-define gb_TypesRdb_add_urdfile
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES += $(2)
-$(call gb_TypesRdb_get_target,$(1)) : $(2)
-
-endef
-
-define gb_TypesRdb_add_urdfiles
-$(foreach urd,$(2),$(call gb_TypesRdb_add_urdfile,$(1),$(urd)))
-
-endef
-
-define gb_TypesRdb_add_rdbfile
-$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE += $(call gb_TypesRdb_get_outdir_target,$(2))
-$(call gb_TypesRdb_get_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(2))
-
-endef
-
-define gb_TypesRdb_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_TypesRdb_add_rdbfile,$(1),$(rdb)))
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
new file mode 100644
index 000000000000..8348826ee903
--- /dev/null
+++ b/solenv/gbuild/UnoApi.mk
@@ -0,0 +1,156 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(call gb_UnoApi_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),UNO,4)
+	$(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@)
+
+.PHONY : $(call gb_UnoApi_get_clean_target,%)
+$(call gb_UnoApi_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),UNO,4)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		rm -f $(call gb_UnoApi_get_target,$*))
+
+define gb_UnoApi_UnoApi
+$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
+$(call gb_Package_Package,$(1)_idl,$(SRCDIR))
+$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$(1)))
+
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_inc)
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl)
+$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc)
+
+$(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1))
+
+$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
+
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))
+
+endef
+
+define gb_UnoApi__add_idlfile
+$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(2)),$(2))
+
+endef
+
+define gb_UnoApi__add_headerfile_impl
+$(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3))
+$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(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 interfaces, exceptions, structs, enums, constant groups
+define gb_UnoApi_add_idlfile
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_full,$(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)))
+
+endef
+
+# for new-style services
+define gb_UnoApi_add_idlfile_nohdl
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_nohdl,$(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)))
+
+endef
+
+# for old-style services and modules
+define gb_UnoApi_add_idlfile_noheader
+$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApi__add_idlfile_noheader,$(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)))
+
+endef
+
+define gb_UnoApi__add_api
+$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2))
+$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
+
+endef
+
+define gb_UnoApi_add_api
+$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApi_add_reference_rdbfile
+$(call gb_UnoApiTarget_add_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:
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
new file mode 100644
index 000000000000..d23ce75bc429
--- /dev/null
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# Note: targets for this class are the same as for UnoApi, therefore
+# there is no need to define them again (and if we did, they would
+# overwrite the UnoApi targets anyway...)
+
+define gb_UnoApiMerge_UnoApiMerge
+$(call gb_UnoApiTarget_UnoApiTarget,$(1))
+
+$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+
+$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
+
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1))))
+
+endef
+
+define gb_UnoApiMerge_add_rdbfile
+$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2))
+
+endef
+
+define gb_UnoApiMerge_add_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApiMerge_add_reference_rdbfile
+$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 3fc9cfe0d592..eaf4aa204b70 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -26,62 +26,141 @@
 #
 #*************************************************************************
 
-gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build)
-gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET)
-gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare$(gb_Executable_EXT_for_build)
-gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build)
-gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
-gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview$(gb_Executable_EXT_for_build)
-gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+# UnoApiPartTarget
+
+gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc)
+gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET)
 
-$(call gb_UnoApiTarget_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@)
+# The .urd files are actually created by the gb_UnoApiPartTarget__command,
+# invoked for the per-directory .done files.
+# The reason why .urd files are tracked is so new files that are added are
+# picked up and cause a rebuild, even if older than the .done file (also, as a
+# convenience for users who delete them from the workdir by hand; this dummy
+# rule plus the dependency from the .done target to the .urd file plus the
+# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be
+# invoked with the .idl file corresponding to the .urd in that case.
+# Touch the .urd file, so it is newer than the .done file, causing that to
+# be rebuilt and overwriting the .urd file again.
+$(call gb_UnoApiPartTarget_get_target,%.urd) :
+	mkdir -p $(dir $@) && touch $@
 
-define gb_UnoApiTarget_autopackage_inc
-$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty))))
-$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \
-	$$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile))))
+# TODO:
+# - get idlc switch "-P" (generate .urd into package dir)
+# - empty $? in headertarget?
 
-$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1))
+define gb_UnoApiPartTarget__command
+	$(call gb_Output_announce,$(2),$(true),IDL,2)
+	mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+		$(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \
+		-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
+		-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \
+		$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \
+	$(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+	rm -f $${RESPONSEFILE} && \
+	touch $(1)
 
 endef
 
-define gb_UnoApiTarget_autopackage_idl
-$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
-$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
-	$$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile))))
+$(call gb_UnoApiPartTarget_get_target,%.done) :
+	$(call gb_UnoApiPartTarget__command,$@,$*,$?)
+
+ifeq ($(gb_FULLDEPS),$(true))
+
+$(call gb_UnoApiPartTarget_get_dep_target,%) :
+	$(if $(realpath $@),touch $@,\
+	  $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd)))
+
+endif
+
+# UnoApiTarget
+
+gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare)
+gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
+gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
 
+define gb_UnoApiTarget__command_impl
+RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(2) $(3))) && \
+$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
+rm -f $${RESPONSEFILE}
 endef
 
+define gb_UnoApiTarget__command
+$(call gb_Output_announce,$*,$(true),RDB,3)
+mkdir -p $(dir $(1)) && \
+$(if $(UNOAPI_FILES),\
+	$(call gb_UnoApiTarget__command_impl,$(1),UCR,$(UNOAPI_FILES)),\
+	$(call gb_UnoApiTarget__command_impl,$(1),/,$(UNOAPI_MERGE))) \
+$(if $(UNOAPI_REFERENCE), \
+	$(call gb_Output_announce,$*,$(true),DBc,3) \
+	&& $(gb_UnoApiTarget_REGCOMPARECOMMAND) \
+		-f -t \
+		-r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) \
+		-r2 $(call gb_Helper_convert_native,$(1)))
+endef
+
+$(call gb_UnoApiTarget_get_target,%):
+	$(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\
+		$(error Both IDL files and merged RDBs were added: this is not supported),\
+		$(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\
+			$(error Neither IDL files nor merged RDBs were added: nothing will be produced)))
+	$(call gb_UnoApiTarget__command,$@,$*,$<,$?)
+
+.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
+$(call gb_UnoApiTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),RDB,3)
+	-$(call gb_Helper_abbreviate_dirs,\
+		rm -f $(call gb_UnoApiTarget_get_target,$*))
+		-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
+			$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
+			$(call gb_UnoApiPartTarget_get_target,$*)
+
+# cat the deps of all IDLs in one file, then we need only open that one file
+define gb_UnoApiTarget__command_dep
+$(call gb_Output_announce,IDL:$(2),$(true),DEP,1)
+$(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
+		$(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
+	$(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \
+	rm -f $${RESPONSEFILE}
+
+endef
+
+ifeq ($(gb_FULLDEPS),$(true))
+
+$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%)
+	$(call gb_UnoApiTarget__command_dep,$@,$*,$(UNOAPI_IDLFILES))
+
+endif
+
 define gb_UnoApiTarget_UnoApiTarget
-$(call gb_TypesRdb_TypesRdb,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiTarget_get_outdir_target,$(1)),$(call gb_UnoApiTarget_get_clean_target,$(1))))
-$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(1))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_TypesRdb_get_target,$(1))
-$(call gb_UnoApiTarget_get_clean_target,$(1)) : $(call gb_TypesRdb_get_clean_target,$(1))
 $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS :=
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES :=
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
-gb_UnoApiTarget_HPPFILES_$(1) :=
-gb_UnoApiTarget_IDLFILES_$(1) :=
-
-$(call gb_Deliver_add_deliverable,$(call gb_UnoApiTarget_get_outdir_target,$(1)),$(call gb_TypesRdb_get_target,$(1)),$(1))
 
 ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES :=
 -include $(call gb_UnoApiTarget_get_dep_target,$(1))
 endif
 
 endef
 
+define gb_UnoApiTarget__add_urdfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES += $(2)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(2)
+
+endef
+
 define gb_UnoApiTarget__add_idlfile
 $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
 	$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
-gb_UnoApiTarget_IDLFILES_$(1) += $(2)/$(3).idl
-$(call gb_TypesRdb_add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
+$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
 
 ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl
 $(call gb_UnoApiTarget_get_dep_target,$(1)) : \
        $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3))
 $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \
@@ -104,68 +183,19 @@ $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
 
 endef
 
-# for interfaces, exceptions, structs, enums, constant groups
 define gb_UnoApiTarget_add_idlfile
-gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hdl $(2)/$(3).hpp
-
-$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \
-	$(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hdl) :| \
-	$(call gb_UnoApiTarget_get_target,$(1))
-
-$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
-
-endef
-
-define gb_UnoApiTarget_add_idlfiles_noheader
-$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
-$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
-
-endef
-
-# for old-style services and modules
-define gb_UnoApiTarget_add_idlfile_noheader
-$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
-
-endef
-
-define gb_UnoApiTarget_add_idlfiles_nohdl
-$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
-$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
-
-endef
-
-# for new-style services
-define gb_UnoApiTarget_add_idlfile_nohdl
-gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hpp
-
-$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \
-	$(call gb_UnoApiTarget_get_target,$(1))
-
 $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
 
 endef
 
-define gb_UnoApiTarget_add_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb)))
-
-endef
-
-define gb_UnoApiTarget_add_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_TypesRdb_get_outdir_target,$(2))
-$(call gb_UnoApiTarget_get_target,$(1)) : \
-	$(call gb_TypesRdb_get_outdir_target,$(2)) \
-	$(call gb_Package_get_target,$(2)_idl)
-
-endef
-
-define gb_UnoApiTarget_add_merge_rdbfiles
-$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb)))
+define gb_UnoApiTarget_merge_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb)))
 
 endef
 
-define gb_UnoApiTarget_add_merge_rdbfile
-$(call gb_TypesRdb_add_rdbfile,$(1),$(2))
+define gb_UnoApiTarget_merge_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
 
 endef
 
@@ -179,96 +209,77 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2)
 
 endef
 
-.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
-$(call gb_UnoApiTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UNO,2)
-	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UnoApiTarget_get_target,$*) \
-			$(call gb_UnoApiTarget_get_outdir_target,$*))
-	-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
-			$(call gb_UnoApiTarget_get_dep_target,$*) \
-			$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
-			$(call gb_UnoApiPartTarget_get_target,$*)
+# UnoApiHeadersTarget
 
-# The .urd files are actually created by the gb_UnoApiPartTarget__command,
-# invoked for the per-directory .done files.
-# The reason why .urd files are tracked is so new files that are added are
-# picked up and cause a rebuild, even if older than the .done file (also, as a
-# convenience for users who delete them from the workdir by hand; this dummy
-# rule plus the dependency from the .done target to the .urd file plus the
-# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be
-# invoked with the .idl file corresponding to the .urd in that case.
-# Touch the .urd file, so it is newer than the .done file, causing that to
-# be rebuilt and overwriting the .urd file again.
-$(call gb_UnoApiPartTarget_get_target,%.urd) :
-	mkdir -p $(dir $@) && touch $@
+gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker)
+gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
 
-$(call gb_UnoApiPartTarget_get_target,%.done) :
-	$(call gb_UnoApiPartTarget__command,$@,$*,$?)
-
-
-define gb_UnoApiPartTarget__command
-	$(call gb_Output_announce,$(2),$(true),IDL,2)
-	mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
-		$(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \
-		-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
-		-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \
-		$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \
-	$(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
-	rm -f $${RESPONSEFILE} && \
-	touch $(1)
+define gb_UnoApiHeadersTarget__command
+RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+	$(call gb_Helper_convert_native,-Gc $(4) -BUCR \
+	-O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS))) && \
+$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
+rm -f $${RESPONSEFILE} && \
+touch $(1)
 
 endef
 
-define gb_UnoApiTarget__command
-$(call gb_Output_announce,$*,$(true),UNO,2)
-$(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && touch $(1))
+$(call gb_UnoApiHeadersTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),HPP,3)
+	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*))
+
+$(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) :
+	$(call gb_Output_announce,$*,$(true),HPC,3)
+	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C)
+
+$(call gb_UnoApiHeadersTarget_get_lightweight_target,%) :
+	$(call gb_Output_announce,$*,$(true),HPL,3)
+	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*),-L)
+
+.PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%)
+$(call gb_UnoApiHeadersTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),HPP,3)
+	$(call gb_Helper_abbreviate_dirs_native,\
+		rm -rf \
+			$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \
+			$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*) \
+		   	$(call gb_UnoApiHeadersTarget_get_dir,$*) \
+			$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) \
+			$(call gb_UnoApiHeadersTarget_get_lightweight_target,$*) \
+		   	$(call gb_UnoApiHeadersTarget_get_target,$*))
+
+define gb_UnoApiHeadersTarget_UnoApiHeadersTarget
+$(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+
+$(call gb_UnoApiHeadersTarget_get_target,$(1)) : UNOAPI_DEPS :=
+$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS :=
+$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : UNOAPI_DEPS :=
+
 endef
 
-define gb_UnoApiHeaderTarget__command
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
-		$(call gb_Helper_convert_native,-Gc -L -BUCR \
-		-O$(call gb_UnoApiTarget_get_header_target,$(2)) $(3) $(1))) && \
-	$(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
-	rm -f $${RESPONSEFILE}
+define gb_UnoApiHeadersTarget_add_headerfile
 
 endef
 
-# cat the deps of all IDLs in one file, then we need only open that one file
-define gb_UnoApiTarget__command_dep
-$(call gb_Output_announce,IDL:$(2),$(true),DEP,1)
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
-		$(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
-	$(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \
-	rm -f $${RESPONSEFILE}
+define gb_UnoApiHeadersTarget__add_rdbfile
+$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
+$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2))
 
 endef
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_UnoApiPartTarget_get_dep_target,%) :
-	$(if $(realpath $@),touch $@,\
-	  $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd)))
+define gb_UnoApiHeadersTarget_add_rdbfile
+$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target)
+$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target)
+$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),lightweight_target)
 
-$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%)
-	$(call gb_UnoApiTarget__command_dep,$@,$*,$(gb_UnoApiTarget_IDLFILES_$*))
+endef
 
-endif
+define gb_UnoApiHeadersTarget_add_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb)))
 
-# TODO:
-# - get idlc switch "-P" (generate .urd into package dir)
-# - empty $? in headertarget?
-
-$(call gb_UnoApiTarget_get_target,%):
-	$(call gb_UnoApiTarget__command,$@,$*,$<,$?)
-	$(if $(UNOAPI_REFERENCE), \
-		$(call gb_Output_announce,$*,$(true),DBc,4) \
-	    $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$(call gb_TypesRdb_get_target,$*)))
-	$(if $(gb_UnoApiTarget_IDLFILES_$*), \
-		$(call gb_Output_announce,$*,$(true),HPP,4) \
-		$(call gb_UnoApiHeaderTarget__command,$(call gb_TypesRdb_get_target,$*),$*,$(UNOAPI_DEPS)))
+endef
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6884b34520f8..198e167c886f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -289,8 +289,9 @@ include $(foreach class, \
 	JavaClassSet \
 	JunitTest \
 	Module \
-	TypesRdb \
 	UnoApiTarget \
+	UnoApi \
+	UnoApiMerge \
 	Zip \
 	Configuration \
 	Extension \