gbuild: install rdb files directly in module they come from

Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26

13 files changed, 35 insertions, 34 deletions

diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk
index 394aa5b0469f..7f58482d2a50 100644
--- a/connectivity/Rdb_postgresql-sdbc.mk
+++ b/connectivity/Rdb_postgresql-sdbc.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,postgresql-sdbc))
 
+$(eval $(call gb_Rdb_install,postgresql-sdbc))
+
 $(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
 	connectivity/source/drivers/postgresql/postgresql-sdbc \
 	connectivity/source/drivers/postgresql/postgresql-sdbc-impl \
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk
index 7c098d3dfe5e..49bcb128d31d 100644
--- a/instsetoo_native/Module_instsetoo_native.mk
+++ b/instsetoo_native/Module_instsetoo_native.mk
@@ -21,7 +21,6 @@ ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(eval $(call gb_Module_add_targets,instsetoo_native,\
 	CustomTarget_setup \
 	Package_config \
-	Package_rdb \
 	Package_setup \
 ))
 endif
diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
deleted file mode 100644
index 308bb460c801..000000000000
--- a/instsetoo_native/Package_rdb.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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_Package_Package,instsetoo_native_rdb,$(OUTDIR)))
-
-$(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/services,\
-	xml/services.rdb \
-	$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
-	$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
-		$(if $(ENABLE_JAVA),\
-			$(if $(ENABLE_SCRIPTING_BEANSHELL),xml/scriptproviderforbeanshell.rdb) \
-			$(if $(ENABLE_SCRIPTING_JAVASCRIPT),xml/scriptproviderforjavascript.rdb) \
-		) \
-	) \
-))
-
-$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/types,\
-	bin/offapi.rdb \
-	bin/oovbaapi.rdb \
-))
-
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/services.rdb,xml/ure/services.rdb))
-$(eval $(call gb_Package_add_file,instsetoo_native_rdb,ure/share/misc/types.rdb,bin/udkapi.rdb))
-
-# vim: set noet sw=4 ts=4:
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 01b2db97711f..6eeb694b6877 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,offapi))
 
+$(eval $(call gb_UnoApi_install,offapi,$(gb_PROGRAMDIRNAME)/types/offapi.rdb))
+
 $(eval $(call gb_UnoApi_package_idlfiles,offapi))
 
 $(eval $(call gb_UnoApi_use_api,offapi,\
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index b2a44e8fc3dc..ff32f151ade3 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,oovbaapi))
 
+$(eval $(call gb_UnoApi_install,oovbaapi,$(gb_PROGRAMDIRNAME)/types/oovbaapi.rdb))
+
 $(eval $(call gb_UnoApi_use_api,oovbaapi,\
     udkapi \
     offapi \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ef6223dbbb3b..00be52487c41 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,services))
 
+$(eval $(call gb_Rdb_install,services))
+
 $(eval $(call gb_Rdb_add_components,services,\
 	animations/source/animcore/animcore \
 	avmedia/util/avmedia \
diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk
index 4d4f5cabf633..71050eca6c59 100644
--- a/pyuno/Rdb_pyuno.mk
+++ b/pyuno/Rdb_pyuno.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,pyuno))
 
+$(eval $(call gb_Rdb_install,pyuno))
+
 $(eval $(call gb_Rdb_add_components,pyuno, \
     pyuno/source/loader/pythonloader \
 ))
diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk b/scripting/Rdb_scriptproviderforbeanshell.mk
index ef52d7660bc0..0a086949fa33 100644
--- a/scripting/Rdb_scriptproviderforbeanshell.mk
+++ b/scripting/Rdb_scriptproviderforbeanshell.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell))
 
+$(eval $(call gb_Rdb_install,scriptproviderforbeanshell))
+
 $(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
 	scripting/java/ScriptProviderForBeanShell \
 ))
diff --git a/scripting/Rdb_scriptproviderforjavascript.mk b/scripting/Rdb_scriptproviderforjavascript.mk
index aec5dc6b1be9..1ac23abc97af 100644
--- a/scripting/Rdb_scriptproviderforjavascript.mk
+++ b/scripting/Rdb_scriptproviderforjavascript.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript))
 
+$(eval $(call gb_Rdb_install,scriptproviderforjavascript))
+
 $(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
 	scripting/java/ScriptProviderForJavaScript \
 ))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 5bfa3a2113af..47d4d203ef50 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -29,6 +29,8 @@ $(call gb_Rdb_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
 
+gb_Rdb_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
+
 define gb_Rdb_Rdb
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
 $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
@@ -39,6 +41,13 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),
 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1)))
 endef
 
+define gb_Rdb_install
+$(call gb_Helper_install,$(call gb_Rdb_get_outdir_target,$(1)), \
+	$(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb_get_install_target,$(1))), \
+	$(call gb_Rdb_get_target,$(1)))
+
+endef
+
 define gb_Rdb_add_component
 $(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 6cadaf998e7b..373953052fe3 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -37,6 +37,14 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
 
 endef
 
+define gb_UnoApi_install
+$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.))
+$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \
+	$(INSTDIR)/$(2), \
+	$(call gb_UnoApiTarget_get_target,$(1)))
+
+endef
+
 ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
 
 # Create a package of IDL files for putting into SDK.
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 8a99513b5dec..591fd606543f 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -19,6 +19,8 @@
 
 $(eval $(call gb_UnoApi_UnoApi,udkapi))
 
+$(eval $(call gb_UnoApi_install,udkapi,$(LIBO_URE_SHARE_FOLDER)/misc/types.rdb))
+
 $(eval $(call gb_UnoApi_package_idlfiles,udkapi))
 
 $(eval $(call gb_UnoApi_set_include,udkapi,\
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index bc88139013c4..ba172a75dca3 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Rdb_Rdb,ure/services))
 
+$(eval $(call gb_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
+
 $(eval $(call gb_Rdb_add_components,ure/services,\
 	$(if $(filter IOS,$(OS)),, \
         io/source/acceptor/acceptor \