From 1d77c8a706d248fd757d0558cb101b068c87e820 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Fri, 18 Nov 2016 12:21:23 +0100 Subject: Move processing of help-specific images to helpcontent Change-Id: I4370c7ab41184a59bb92e8df49f2fe3ca84c9c8c Reviewed-on: https://gerrit.libreoffice.org/30958 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier --- CustomTarget_imagelist.mk | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'CustomTarget_imagelist.mk') diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk index ee42949fe0..b616d4de60 100644 --- a/CustomTarget_imagelist.mk +++ b/CustomTarget_imagelist.mk @@ -9,16 +9,33 @@ $(eval $(call gb_CustomTarget_CustomTarget,helpcontent2/source/auxiliary)) +helpmedia_DIR := $(SRCDIR)/helpcontent2/source + $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\ helpimg.ilst \ screenshotimg.ilst \ + images_helpimg.zip \ )) +$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \ + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \ + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst \ + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Helper_abbreviate_dirs, \ + ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ + $(PERL) $(SRCDIR)/solenv/bin/packimages.pl \ + -g $(helpmedia_DIR) -m $(helpmedia_DIR) -c $(helpmedia_DIR) \ + -l $${ILSTFILE} \ + -s $< -o $@ \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ + rm -rf $${ILSTFILE}) + + $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst : \ $(SRCDIR)/helpcontent2/helpers/create_ilst.pl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs,\ - $(PERL) $< -dir=$(SRCDIR)/icon-themes/galaxy/res/helpimg > $@.out && \ + $(PERL) $< -dir=$(helpmedia_DIR)/media/helpimg -pre=media/helpimg > $@.out && \ mv $@.out $@ \ ) @@ -26,7 +43,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg. $(SRCDIR)/helpcontent2/helpers/create_ilst.pl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs,\ - $(PERL) $< -dir=$(SRCDIR)/helpcontent2/source/media/screenshots -pre=media/screenshots > $@.out && \ + $(PERL) $< -dir=$(helpmedia_DIR)/media/screenshots -pre=media/screenshots > $@.out && \ mv $@.out $@ \ ) -- cgit