strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use sort on finds to improve deterministic build

Browse source 
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>
This commit is contained in:
Tomáš Chvátal 2019-04-04 13:33:26 +02:00 committed by Michael Stahl
parent 4a6dc219fc
commit 766425e2c5
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
postprocess/CustomTarget_images.mk
View file

@ -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 : \

2
postprocess/CustomTarget_registry.mk
View file

@ -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>"}' > $@ \

2
solenv/gbuild/GeneratedPackage.mk
View file

@ -42,7 +42,7 @@ $(call gb_GeneratedPackage_get_target,%) :
$(foreach pair,$(PACKAGE_DIRS),&& cp -R $(PACKAGE_SOURCEDIR)/$(call gb_GeneratedPackage__get_srcdir,$(pair)) $(call gb_GeneratedPackage__get_destdir,$(pair))) \
)
$(call gb_Helper_abbreviate_dirs,\
$(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print > $@ \
$(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print | LC_ALL=C $(SORT) > $@ \
)
.PHONY : $(call gb_GeneratedPackage_get_clean_target,%)

2
solenv/gbuild/Module.mk
View file

@ -235,7 +235,7 @@ $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex tr
$(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \
&& $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" > $(dir $@)/LIST \
&& $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
&& touch $@)
# enable if: no "-MODULE/" defined AND ["all" defined OR "MODULE/" defined]