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

2022-12-13 Thread Christian Lohmaier (via logerrit) 
 CustomTarget_imagelist.mk |   16 +---
 helpers/create_ilst.pl|   59 --
 2 files changed, 7 insertions(+), 68 deletions(-)

New commits:
commit 5b99afe8ba3afe1a4673f8b7628011ced5583570
Author: Christian Lohmaier 
AuthorDate: Fri Dec 9 21:15:52 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Dec 13 15:11:32 2022 +

avoid needless rebuilds of helpimages

also the create_ilist.pl doesn't really do much anymore, was easily
replaced by a plain $(file …) call

Change-Id: I63a41ef8ed289feb4ab210961d2200032adaac28
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143936
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index c4769b3cd5..d325a46659 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -29,15 +29,13 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
rm -rf $${ILSTFILE})
 
-# helpimg.ilst is phony to rebuild everything each time
-.PHONY : $(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst
+# include everything including directories to also rebuild on file deletion
+helpmedia_allMedia:=$(shell $(FIND) $(helpmedia_DIR)/media/helpimg)
+# but we're only interested in the png images
+helpmedia_images = $(filter %.png,$(helpmedia_allMedia))
 
-$(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=$(helpmedia_DIR)/media/helpimg 
-pre=media/helpimg > $@.out && \
-   mv $@.out $@ \
-   )
+$(call 
gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst: 
$(helpmedia_allMedia)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LST,1)
+   $(file >$@,$(subst $(WHITESPACE),$(NEWLINE),$(sort $(subst 
$(helpmedia_DIR)/,%MODULE%/,$(helpmedia_images)
 
 # vim: set noet sw=4 ts=4:
diff --git a/helpers/create_ilst.pl b/helpers/create_ilst.pl
deleted file mode 100644
index b1cd682835..00
--- a/helpers/create_ilst.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# creates the ilst control file for the
-# help specific images
-
-use File::Find;
-
-$params = join "|", "",@ARGV,"";
-($params =~ /-dir/) ? ($startdir = $params) =~ (s/.*-dir=([^\|]*).*$/$1/gs) : 
(($startdir = `pwd`) =~ s/\n//gs);
-($params =~ /-pre/) ? ($pre = $params) =~ (s/.*-pre=([^\|]*).*$/$1/gs) : ($pre 
= "helpimg");
-
-my $startdir_regexp = quotemeta($startdir);
-
-
-if ( -d $startdir ) {
-find(sub{push @files, $File::Find::name if 
(($File::Find::name=~/\.png$/));},$startdir);
-foreach ( @files ) { s#.*$startdir_regexp[\\/]##; };
-for (sort(@files)) {
-# it's now all in one place so no need to distinguish GLOBALRES vs. 
HELPCONTENT
-$prefix = "%MODULE%/";
-print "$prefix" . "$pre/$_\n";
-}
-} else {
-("Cannot find $startdir.");
-}
-
-
-sub terminate {
-$err = shift;
-printf STDERR "$err\n\n";
-$msg = <<"MSG";
-create_ilst.pl -dir=directory [-pre=string] 
--dir  root directory for the help images to
-be searched (default=current dir)
-Only *.png will be found.
--pre  define directory prefix (default=helpimg)
-  
-MSG
-die "$msg\n";
-}

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

2016-11-04 Thread 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 
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 
Tested-by: Olivier Hallot 

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 {
 ("Cannot find $startdir.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits