ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

gbuild: implement gb_UnoApi_get_target_for_build

Browse Source 
Change-Id: Iaee243510023bf935097914fd6c4fcb701d35c13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116438
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2021-05-31 13:19:21 +02:00
parent af281d5bc2
commit 7efb6328cb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
+5 -5
View File
@@ -3869,7 +3869,7 @@ define gb_Executable__register_climaker
$(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno)
)
endef
@@ -3893,8 +3893,8 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(INSTROOT_FOR_BUILD)/$(LIBO_ETC_FOLDER)/services/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
$(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target_for_build,offapi) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
@@ -3932,7 +3932,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Package_get_target_for_build,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target_for_build,saxparser) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER_FOR_BUILD)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
@@ -3943,7 +3943,7 @@ define gb_Executable__register_uno
$(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target_for_build,udkapi) \
)
endef
solenv/gbuild/TargetLocations.mk
+1
View File
@@ -29,6 +29,7 @@ gb_PackagePart_get_destinations = \
# kind of lame but with just 3 of these why bother with registration etc.
gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter udkapi,$(1)),$(LIBO_URE_MISC_FOLDER)/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
# workdir target patterns