From d7559de4f70afdf64dea3bfbf462f5f188da7d05 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 19 Apr 2017 12:02:25 +0100 Subject: remove bitmaps from .src files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and into includeable .hlst files, add them to postprocess/CustomTarget_images.mk to continue only including used bitmaps in icon-theme zips Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e Reviewed-on: https://gerrit.libreoffice.org/36941 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- postprocess/CustomTarget_images.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index def511bc4940..cb4c8e2fa175 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -27,11 +27,9 @@ $(packimages_DIR)/images%.zip : INDUSTRIAL_FALLBACK := $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ - $(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \ - $(SRCDIR)/vcl/source/control/throbber.ilst \ + $(packimages_DIR)/sourceimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/screenshotimg.ilst) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Helper_get_imagelists) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ @@ -48,6 +46,16 @@ $(packimages_DIR)/%.zip : \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ rm -rf $${ILSTFILE}) +# turn the #defines foo "resource.png" of hlst into the final ilst format +$(packimages_DIR)/sourceimagelist.ilst : \ + $(SRCDIR)/avmedia/inc/bitmaps.hlst \ + $(SRCDIR)/basctl/inc/bitmaps.hlst \ + $(SRCDIR)/connectivity/inc/bitmaps.hlst \ + $(SRCDIR)/cui/inc/bitmaps.hlst \ + $(SRCDIR)/sfx2/inc/bitmaps.hlst \ + $(SRCDIR)/vcl/inc/bitmaps.hlst + grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ + # commandimagelist.ilst and sorted.lst are phony to rebuild everything each time .PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst -- cgit v1.2.3