diff options
| author | Tomáš Chvátal <tchvatal@suse.com> | 2019-04-04 13:33:26 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-04-08 12:01:16 +0200 |
| commit | 766425e2c58a00480feb3e30d9114df50a8e03a1 (patch) | |
| tree | 099f0daeb96e3878be559e79e00c70974631b56f /postprocess | |
| parent | 4a6dc219fc0bb04f3e6a7f32344afcd058b38ebe (diff) | |
Use sort on finds to improve deterministic build
This should sort out all outputs prior processing them further resulting
in equal output among multiple builds.
Change-Id: Iaf24bbb94eb7b8960177bcf2c3e08d31d2fb7210
Reviewed-on: https://gerrit.libreoffice.org/70254
Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 4 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 5ad55799e1e1..f1e32f0b28ff 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -96,9 +96,9 @@ $(packimages_DIR)/commandimagelist.ilst : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ $(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \ - grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | $(SORT) | uniq | \ + grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | \ sed "s#^#%MODULE%#" | \ - LC_ALL=C $(SORT) > $@.tmp && \ + LC_ALL=C $(SORT) -u > $@.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@)) $(packimages_DIR)/sorted.lst : \ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index e84c35eec7e5..a2560f2e2d74 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -597,6 +597,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : $(call gb_Helper_abbreviate_dirs,\ $(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \ -name *.xcu -size +0c \ + | LC_ALL=C $(SORT) \ | $(gb_AWK) 'BEGIN{print "<list>"} \ {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ @@ -612,6 +613,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ $(call gb_XcuResTarget_get_target,updchk/$*/))\ -name *.xcu \ + | LC_ALL=C $(SORT) \ | $(gb_AWK) 'BEGIN{print "<list>"} \ {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ |