mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: install rdb files directly in module they come from

Browse Source 
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
This commit is contained in:
Matúš Kukan
2013-06-19 13:52:44 +02:00
committed by Michael Stahl
parent d78e4f0c46
commit d44759e3d7
13 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/Rdb_postgresql-sdbc.mk
View File

@@ -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 \

1
instsetoo_native/Module_instsetoo_native.mk
View File

@@ -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

33
instsetoo_native/Package_rdb.mk
View File

@@ -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:

2
offapi/UnoApi_offapi.mk
View File

@@ -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,\

2
oovbaapi/UnoApi_oovbaapi.mk
View File

@@ -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 \

2
postprocess/Rdb_services.mk
View File

@@ -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 \

2
pyuno/Rdb_pyuno.mk
View File

@@ -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 \
))

2
scripting/Rdb_scriptproviderforbeanshell.mk
View File

@@ -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 \
))

2
scripting/Rdb_scriptproviderforjavascript.mk
View File

@@ -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 \
))

9
solenv/gbuild/Rdb.mk
View File

@@ -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)

8
solenv/gbuild/UnoApi.mk
View File

@@ -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.

2
udkapi/UnoApi_udkapi.mk
View File

@@ -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,\

2
ure/Rdb_ure.mk
View File

@@ -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 \