summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-05-02 10:40:01 +0200
committerGerrit Code Review <gerrit@gerrit.libreoffice.org>2018-05-02 10:42:29 +0200
commit8e09329ea6e1625cbb9a4b79ad13e462c965b973 (patch)
tree92bb34a525b967bc794fd0ff741e3d3887914750 /solenv
parent0c8df66364355afb47e5f9dcd73a677f650341e1 (diff)
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
0 files changed, 0 insertions, 0 deletions