[Libreoffice-commits] help.git: CustomTarget_imagelist.mk helpers/create_ilst.pl

[Katarina Behrens]

 CustomTarget_imagelist.mk |    9 +++++++++
 helpers/create_ilst.pl    |    3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 98d298e4ef2bc9ad9f4e2d2bb83c3183e3ee0977
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue Aug 30 15:53:18 2016 +0200

    Create a new image list for 'make postprocess'
    
    with screenshot images
    
    corrected path as indicated
    
    Change-Id: I3d81c88a4ae002f12247ec4a5587e50f9927a005
    Reviewed-on: https://gerrit.libreoffice.org/28499
    Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
    Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>

diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index 027cf2c..ee42949 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,helpcontent2/source/auxiliary))
 
 $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\
 	helpimg.ilst \
+	screenshotimg.ilst \
 ))
 
 $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst : \
@@ -21,4 +22,12 @@ $(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=$(SRCDIR)/helpcontent2/source/media/screenshots -pre=media/screenshots > $@.out && \
+			mv $@.out $@ \
+	)
+
 # vim: set noet sw=4 ts=4:
diff --git a/helpers/create_ilst.pl b/helpers/create_ilst.pl
index b49a075..c6b9789 100644
--- a/helpers/create_ilst.pl
+++ b/helpers/create_ilst.pl
@@ -35,7 +35,8 @@ if ( -d $startdir ) {
     find(sub{push @files, $File::Find::name if (($File::Find::name=~/\.png$/));},$startdir);
     foreach ( @files ) { s#.*$startdir_regexp[\\/]##; };
     for (sort(@files)) {
-        print "%GLOBALRES%/$pre/$_\n";
+        ($pre eq "helpimg") ? ($prefix = "%GLOBALRES%/") : ($prefix = "%HELPCONTENT%/");
+        print "$prefix" . "$pre/$_\n";
     }
 } else {
     &terminate("Cannot find $startdir.");