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

Build services_constructors.list from target component files

Browse Source 
...rather than from source component files, so that
<https://gerrit.libreoffice.org/c/core/+/126560> "Allow for conditional parts of
component files" (which adds further processing to the translation from source
to target component files) will also affect the contents of
CustomTarget_postprocess/components's services_constructors.list

Change-Id: Ie5ef42b91b09f5be0d8d512093a6b7e60aee5b50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126644
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2021-12-10 16:51:22 +01:00
parent daa8e90fc9
commit 28ff78c950
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postprocess/CustomTarget_components.mk
View File

@@ -26,11 +26,11 @@ endef
$(postprocess_WORKDIR)/services_componentfiles.list: \ $(postprocess_WORKDIR)/services_componentfiles.list: \
$(call gb_Rdb_get_target,services) \ $(call gb_Rdb_get_target,services) \
$(call gb_Rdb_get_target,ure/services) \ $(call gb_Rdb_get_target,ure/services) \
$(foreach comp,$(gb_ComponentTarget__ALLCOMPONENTS),$(call gb_ComponentTarget_get_source,$(comp))) \ $(foreach comp,$(gb_ComponentTarget__ALLCOMPONENTS),$(call gb_ComponentTarget_get_target,$(comp))) \
| $(postprocess_WORKDIR)/.dir | $(postprocess_WORKDIR)/.dir
$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),GEN,2) $(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),GEN,2)
TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),1, \ TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),1, \
$(foreach comp,$(sort $(gb_ComponentTarget__ALLCOMPONENTS)),$(call gb_ComponentTarget_get_source,$(comp))$(gb_NEWLINE))) && \ $(foreach comp,$(sort $(gb_ComponentTarget__ALLCOMPONENTS)),$(call gb_ComponentTarget_get_target,$(comp))$(gb_NEWLINE))) && \
mv $$TEMPFILE $@ mv $$TEMPFILE $@
$(postprocess_WORKDIR)/services_constructors.list: \ $(postprocess_WORKDIR)/services_constructors.list: \