Kaydet (Commit) 6667caef authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: remove gb_Rdb__get_final_target

... by replacing gb_Rdb_install with a separate constructor so the right
target can be registered at the module.  There is still an ugly special
case for the ure/services.

Change-Id: I81c004143f201aaf38daca99819888313ee24f49
üst 3b0654ab
......@@ -8,6 +8,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,basic_scanner))
$(eval $(call gb_CppunitTest_use_ure,basic_scanner))
$(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \
basic/qa/cppunit/test_scanner \
))
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,postgresql-sdbc))
$(eval $(call gb_Rdb_install,postgresql-sdbc))
$(eval $(call gb_Rdb_Rdb_install,postgresql-sdbc))
$(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
connectivity/source/drivers/postgresql/postgresql-sdbc \
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,services))
$(eval $(call gb_Rdb_install,services))
$(eval $(call gb_Rdb_Rdb_install,services))
$(eval $(call gb_Rdb_add_components,services,\
animations/source/animcore/animcore \
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,pyuno))
$(eval $(call gb_Rdb_install,pyuno))
$(eval $(call gb_Rdb_Rdb_install,pyuno))
$(eval $(call gb_Rdb_add_components,pyuno, \
pyuno/source/loader/pythonloader \
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,scriptproviderforbeanshell))
$(eval $(call gb_Rdb_install,scriptproviderforbeanshell))
$(eval $(call gb_Rdb_Rdb_install,scriptproviderforbeanshell))
$(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
scripting/java/ScriptProviderForBeanShell \
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Rdb_Rdb,scriptproviderforjavascript))
$(eval $(call gb_Rdb_install,scriptproviderforjavascript))
$(eval $(call gb_Rdb_Rdb_install,scriptproviderforjavascript))
$(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
scripting/java/ScriptProviderForJavaScript \
......
......@@ -8,7 +8,6 @@
#
gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final
define gb_Rdb__command
$(call gb_Helper_abbreviate_dirs,\
......@@ -30,26 +29,34 @@ $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsl
$(call gb_Rdb_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RDB,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Rdb__get_final_target,$*) $(call gb_Rdb_get_target,$*))
$(call gb_Rdb__get_final_target,%) :
touch $@
rm -f $(call gb_Rdb__get_install_target,$*) $(call gb_Rdb_get_target,$*))
define gb_Rdb_Rdb
define gb_Rdb__Rdb_impl
$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
$(call gb_Rdb__get_final_target,$(1)) : $(call gb_Rdb_get_target,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Rdb__get_final_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_target,$(1)))
$$(eval $$(call gb_Module_register_target,$(2),$(call gb_Rdb_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(2))
endef
define gb_Rdb_install
$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \
define gb_Rdb_Rdb
$(call gb_Rdb__Rdb_impl,$(1),$(call gb_Rdb_get_target,$(1)))
endef
# FIXME this needs some layer-like thing for the special case in URE
define gb_Rdb_Rdb_install
$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))))
$(call gb_Helper_install_final, \
$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
$(call gb_Rdb_get_target,$(1)))
endef
define gb_Rdb_install
$(error gb_Rdb_install removed use gb_Rdb_Rdb_install instead)
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)
......
......@@ -7,9 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(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_Rdb_install,ure/services,$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb))
$(eval $(call gb_Rdb_add_components,ure/services,\
$(if $(filter IOS,$(OS)),, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment