helpcontent2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e09329ea6e1625cbb9a4b79ad13e462c965b973
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 2 10:40:01 2018 +0200
Updated core
Project: help 09f72e64083e9a6003e6c10fa26e1c5ca3c4d785
tdf#116240: Include --with-help=html in installation sets
...by extending the hackery in helpcontent2/CustomTarget_html.mk (see
comment
there). (Ultimately, the gbuild HelpTarget machinery should probably be
adapted
to the needs of this new help format, once the old help format is no longer
supported?)
The Perl packaging code finds source files through the "include" paths
specified
in instsetoo_native/util/openoffice.lst.in. To avoid potential name
clashes,
put the new .filelist files into
workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/
sub-directories.
read_filelist in solenv/bin/modules/installer/filelists.pm does not strip
white
space following the last item in a file list, but (with
HAVE_GNUMAKE_FILE_FUNC)
the gb_HelpTarget_get_translation_target .filelist files (which are then
transformed with sed into the .html .filelist files read by the Perl
packaging
code) may contain such trailing white space. So $(strip ...) their content
in
solenv/gbuild/HelpTarget.mk.
This is the helpcontent2 part of a change spanning core and helpcontent2.
Change-Id: I730caaaec783d0a0a9c79caf85268a775220dee3
Reviewed-on: https://gerrit.libreoffice.org/53724
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/helpcontent2 b/helpcontent2
index cb3e183c7fa7..09f72e64083e 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cb3e183c7fa7bd926e6564e52b5a79b0a0d15262
+Subproject commit 09f72e64083e9a6003e6c10fa26e1c5ca3c4d785
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
