From b29fb89d0a49fde0f5757774d64a7aba8298ac75 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 23 Feb 2020 00:47:07 +0200 Subject: tdf#130911: convert image-sort from Perl to Python Tested with diff that the sorting output file is identical to the one the Perl script produced. Change-Id: I22eb28e71f51315609957e84c6204f1beb5dccaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90348 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- postprocess/CustomTarget_images.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 691db4bd0294..0d2db4f7b2bb 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -52,7 +52,8 @@ $(packimages_DIR)/images_%.zip : \ $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ - $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ + $(call gb_ExternalExecutable_get_command,python) \ + $(SRCDIR)/solenv/bin/pack_images.py \ $(if $(DEFAULT_THEME),\ -g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\ -g $(SRCDIR)/icon-themes/$* -m $(SRCDIR)/icon-themes/$* -c $(SRCDIR)/icon-themes/$* \ @@ -107,11 +108,13 @@ $(packimages_DIR)/commandimagelist.ilst : $(packimages_DIR)/sorted.lst : \ $(SRCDIR)/postprocess/packimages/image-sort.lst \ - $(call gb_Postprocess_get_target,AllUIConfigs) + $(call gb_Postprocess_get_target,AllUIConfigs) \ + $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ - $(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \ + $(call gb_ExternalExecutable_get_command,python) \ + $(SRCDIR)/solenv/bin/image-sort.py \ $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@) $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) -- cgit