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

gbuild: "use" vs. "add"

Browse Source
This commit is contained in:
David Tardon
2012-04-08 08:58:22 +02:00
parent 2283607f49
commit 4a271bf4d2
9 changed files with 81 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
offapi/UnoApiMerge_types.mk
View File

@@ -28,12 +28,12 @@
$(eval $(call gb_UnoApiMerge_UnoApiMerge,types)) $(eval $(call gb_UnoApiMerge_UnoApiMerge,types))
$(eval $(call gb_UnoApiMerge_add_rdbfiles,types,\ $(eval $(call gb_UnoApiMerge_use_api,types,\
udkapi \ udkapi \
offapi \ offapi \
)) ))
$(eval $(call gb_UnoApiMerge_add_reference_rdbfile,types,\ $(eval $(call gb_UnoApiMerge_set_reference_rdbfile,types,\
offapi/type_reference/types \ offapi/type_reference/types \
)) ))

2
offapi/UnoApi_offapi.mk
View File

@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApi_UnoApi,offapi)) $(eval $(call gb_UnoApi_UnoApi,offapi))
$(eval $(call gb_UnoApi_add_api,offapi,\ $(eval $(call gb_UnoApi_use_api,offapi,\
udkapi \ udkapi \
)) ))

2
oovbaapi/UnoApi_oovbaapi.mk
View File

@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApi_UnoApi,oovbaapi)) $(eval $(call gb_UnoApi_UnoApi,oovbaapi))
$(eval $(call gb_UnoApi_add_api,oovbaapi,\ $(eval $(call gb_UnoApi_use_api,oovbaapi,\
udkapi \ udkapi \
offapi \ offapi \
)) ))

4
scaddins/InternalUnoApi_scaddins.mk
View File

@@ -27,12 +27,12 @@
$(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins)) $(eval $(call gb_InternalUnoApi_InternalUnoApi,scaddins))
$(eval $(call gb_InternalUnoApi_add_api,scaddins,\ $(eval $(call gb_InternalUnoApi_use_api,scaddins,\
offapi \ offapi \
udkapi \ udkapi \
)) ))
$(eval $(call gb_InternalUnoApi_add_api_dependencies,scaddins,offapi,\ $(eval $(call gb_InternalUnoApi_define_api_dependencies,scaddins,offapi,\
udkapi \ udkapi \
)) ))

26
solenv/gbuild/InternalUnoApi.mk
View File

@@ -45,7 +45,7 @@ $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
$(call gb_UnoApiTarget_set_root,$(1)_out,/) $(call gb_UnoApiTarget_set_root,$(1)_out,/)
$(call gb_UnoApiTarget_set_root,$(1),UCR) $(call gb_UnoApiTarget_set_root,$(1),UCR)
$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out) $(call gb_UnoApiTarget_merge_api,$(1),$(1)_out)
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir $(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out) $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out)
@@ -68,15 +68,23 @@ $(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
endef endef
define gb_InternalUnoApi__add_api define gb_InternalUnoApi__use_api
$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2)) $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
endef endef
define gb_InternalUnoApi_add_api define gb_InternalUnoApi_add_api
$(foreach rdb,$(2),$(call gb_InternalUnoApi__add_api,$(1),$(rdb))) $$(call gb_Output_error,gb_InternalUnoApi_add_api: use gb_InternalUnoApi_use_api instead.)
endef
define gb_InternalUnoApi_use_api
$(foreach rdb,$(2),$(call gb_InternalUnoApi__use_api,$(1),$(rdb)))
endef
define gb_InternalUnoApi_add_api_dependency
$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependency: use gb_InternalUnoApi_define_api_dependency instead.)
endef endef
# Express that the rdb $(2) depends on rdb $(3). # Express that the rdb $(2) depends on rdb $(3).
@@ -89,13 +97,17 @@ endef
# I suppose it would be possible to store the list of required rdbs for # I suppose it would be possible to store the list of required rdbs for
# a rdb to a file and then load it when headers' generation is requested, # a rdb to a file and then load it when headers' generation is requested,
# but it feels like overkill... # but it feels like overkill...
define gb_InternalUnoApi_add_api_dependency define gb_InternalUnoApi_define_api_dependency
$(call gb_UnoApiHeadersTarget_add_rdbfile,$(2),$(3)) $(call gb_UnoApiHeadersTarget_use_api,$(2),$(3))
endef endef
define gb_InternalUnoApi_add_api_dependencies define gb_InternalUnoApi_add_api_dependencies
$(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep))) $$(call gb_Output_error,gb_InternalUnoApi_add_api_dependencies: use gb_InternalUnoApi_define_api_dependencies instead.)
endef
define gb_InternalUnoApi_define_api_dependencies
$(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(dep)))
endef endef

17
solenv/gbuild/UnoApi.mk
View File

@@ -130,19 +130,28 @@ $(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl)))
endef endef
define gb_UnoApi__add_api define gb_UnoApi__use_api
$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2)) $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2)) $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
endef endef
define gb_UnoApi_add_api define gb_UnoApi_add_api
$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb))) $$(call gb_Output_error,gb_UnoApi_add_api: use gb_UnoApi_use_api instead.)
endef
define gb_UnoApi_use_api
$(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))
endef endef
define gb_UnoApi_add_reference_rdbfile define gb_UnoApi_add_reference_rdbfile
$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2)) $$(call gb_Output_error,gb_UnoApi_add_reference_rdbfile: use gb_UnoApi_set_reference_rdbfile instead.)
endef
define gb_UnoApi_set_reference_rdbfile
$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
endef endef

19
solenv/gbuild/UnoApiMerge.mk
View File

@@ -45,17 +45,30 @@ $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1))
endef endef
define gb_UnoApiMerge_add_rdbfile define gb_UnoApiMerge_add_rdbfile
$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2)) $$(call gb_Output_error,gb_UnoApiMerge_add_rdbfile: use gb_UnoApiMerge_use_api instead.)
endef
define gb_UnoApiMerge__use_api
$(call gb_UnoApiTarget_merge_api,$(1),$(2))
endef endef
define gb_UnoApiMerge_add_rdbfiles define gb_UnoApiMerge_add_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb))) $$(call gb_Output_error,gb_UnoApiMerge_add_rdbfiles: use gb_UnoApiMerge_use_api instead.)
endef
define gb_UnoApiMerge_use_api
$(foreach rdb,$(2),$(call gb_UnoApiMerge__use_api,$(1),$(rdb)))
endef endef
define gb_UnoApiMerge_add_reference_rdbfile define gb_UnoApiMerge_add_reference_rdbfile
$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2)) $$(call gb_Output_error,gb_UnoApiMerge_add_reference_rdbfile: use gb_UnoApiMerge_set_reference_rdbfile instead.)
endef
define gb_UnoApiMerge_set_reference_rdbfile
$(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2))
endef endef

32
solenv/gbuild/UnoApiTarget.mk
View File

@@ -223,11 +223,19 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
endef endef
define gb_UnoApiTarget_merge_rdbfiles define gb_UnoApiTarget_merge_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb))) $$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfiles: use gb_UnoApiTarget_merge_api instead.)
endef
define gb_UnoApiTarget_merge_api
$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
endef endef
define gb_UnoApiTarget_merge_rdbfile define gb_UnoApiTarget_merge_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfile: use gb_UnoApiTarget_merge_api instead.)
endef
define gb_UnoApiTarget__merge_api
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2)) $(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)) $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
@@ -242,6 +250,10 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_XMLRDB)
endef endef
define gb_UnoApiTarget_add_reference_rdbfile define gb_UnoApiTarget_add_reference_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use gb_UnoApiTarget_set_reference_rdbfile instead.)
endef
define gb_UnoApiTarget_set_reference_rdbfile
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
endef endef
@@ -311,21 +323,29 @@ define gb_UnoApiHeadersTarget_add_headerfile
endef endef
define gb_UnoApiHeadersTarget__add_rdbfile define gb_UnoApiHeadersTarget__use_api_for_target
$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) $(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)) $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2))
endef endef
define gb_UnoApiHeadersTarget_add_rdbfile define gb_UnoApiHeadersTarget_add_rdbfile
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target) $$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfile: use gb_UnoApiHeadersTarget_use_api instead.)
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target) endef
$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target)
define gb_UnoApiHeadersTarget__use_api
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),target)
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),bootstrap_target)
$(call gb_UnoApiHeadersTarget__use_api_for_target,$(1),$(2),comprehensive_target)
endef endef
define gb_UnoApiHeadersTarget_add_rdbfiles define gb_UnoApiHeadersTarget_add_rdbfiles
$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb))) $$(call gb_Output_error,gb_UnoApiHeadersTarget_add_rdbfiles: use gb_UnoApiHeadersTarget_use_api instead.)
endef
define gb_UnoApiHeadersTarget_use_api
$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget__use_api,$(1),$(rdb)))
endef endef

2
udkapi/UnoApiMerge_uretypes.mk
View File

@@ -28,7 +28,7 @@
$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types)) $(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types))
$(eval $(call gb_UnoApiMerge_add_rdbfiles,ure/types,\ $(eval $(call gb_UnoApiMerge_use_api,ure/types,\
udkapi \ udkapi \
)) ))