[Libreoffice-commits] help.git: CustomTarget_imagelist.mk

[Olivier Hallot (via logerrit)]

 CustomTarget_imagelist.mk |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 7b926418c11225c6605a39fdf9a6db7401a14a6c
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Tue Aug 6 19:20:46 2019 -0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Aug 7 12:45:44 2019 +0200

    tdf#126671 Do not pack screenshots in old Help
    
    This is a partial solution for tdf#126671.
    
    Reduces packaging size by ~15MB.
    
    Screenshots are not used in old Help. Old Help is maintained
    for legacy reasons and for extensions that uses XHP files.
    Only nlpsolver/ and swext/ extension have some XHP Help files,
    and none uses screenshots.
    
    Actually, shared/config/images_helpimg.zip packs all
    media/helpimg/*.png files but likely only note.png,
    tip.png and warning.png are used in extension's Help,
    given xmlhelp/util/main_transform.xsl . Since we don't
    have full assurance of the satetement above, the remaining
    PNG's are left in this patch until future review.
    
    If the remainig png files are not used anywhere
    in the LibreOffice extension realm, the zip file could be reduced
    3 files.
    
    Path set 2: remove screenshot.ilst upstream.
    
    Change-Id: I23e401482048f521861707439ceb3e8642bf9b56
    Reviewed-on: https://gerrit.libreoffice.org/77076
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index 099bebe10..06225f121 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -13,13 +13,11 @@ 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_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -31,9 +29,8 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
 		rm -rf $${ILSTFILE})
 
-# helpimg.ilst and screenshotimg.ilst are phony to rebuild everything each time
+# helpimg.ilst is phony to rebuild everything each time
 .PHONY : $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst
-.PHONY : $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst
 
 $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst : \
 		$(SRCDIR)/helpcontent2/helpers/create_ilst.pl
@@ -43,12 +40,4 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst :
 			mv $@.out $@ \
 	)
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/screenshotimg.ilst : \
-		$(SRCDIR)/helpcontent2/helpers/create_ilst.pl
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
-	$(call gb_Helper_abbreviate_dirs,\
-		$(PERL) $< -dir=$(helpmedia_DIR)/media/screenshots -pre=media/screenshots > $@.out && \
-			mv $@.out $@ \
-	)
-
 # vim: set noet sw=4 ts=4: