[Libreoffice-commits] help.git: Properly handle language-specific parts of --with-help=html media/ sub-tree

[Stephan Bergmann]

On 25/05/18 13:57, Stephan Bergmann wrote:
> On 24/05/18 10:50, Stephan Bergmann wrote:
>> New commits:
>> commit 33551e7fd85aa327f76bb343a3740bceb162bbfa
>> Author: Stephan Bergmann <sbergman at redhat.com>
>> Date:   Thu May 24 10:41:34 2018 +0200
>>
>>      Properly handle language-specific parts of --with-help=html 
>> media/ sub-tree
> [...]
>>      What is not quite right yet is that content from
>>      helpcontent2/AllLangPackage_html_lang.mk and
>>      helpcontent2/AllLangPackage_html_media_lang.mk is ending up in 
>> both per-language
>>      helpcontent installation sets (as intended, via the instructions in
>>      helpcontent2/CustomTarget_html.mk) and per-language languagepack 
>> installation
>>      sets (which is unintended).  This needs to be fixed with a 
>> follow-up commit.
> 
> For the record, it appears that the observed behavior is intended, and 
> also happens with the old --with-help format:  For example on Linux with 
> --with-help --with-lang=de --with-package-format=archive, 
> workdir/installation/LibreOffice_languagepack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_langpack_de.tar.gz 
> contains everything from 
> workdir/installation/LibreOffice_helppack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_helppack_de.tar.gz. 
>   This is presumably in line with the behavior for other package 
> formats, where e.g. with --with-package-format=rpm, 
> workdir/installation/LibreOffice_languagepack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de.tar.gz 
> contains the libobasis6.1-de-help-6.1.0.0.alpha1-1.x86_64.rpm from 
> workdir/installation/LibreOffice_helppack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de.tar.gz, 
> too.  (On the other hand, 
> <http://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86_64/LibreOffice_6.0.4_Linux_x86-64_rpm_langpack_de.tar.gz> 
> does not contain a duplicate of 
> libobasis6.0-de-help-6.0.4.2-2.x86_64.rpm from 
> <http://download.documentfoundation.org/libreoffice/stable/6.0.4/rpm/x86_64/LibreOffice_6.0.4_Linux_x86-64_rpm_helppack_de.tar.gz>. 
>   Oh my.)

As cloph explained on IRC, the magic difference is 
--without-helppack-integration explicitly specified in the various 
distro-configs/LibreOffice*.conf (and otherwise defaulting to 
--with-helppack-integration).