solenv/bin/modules/installer.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ba7a76f8122cf2903a943218a0c954181bf6f4d0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Nov 5 20:57:05 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Nov 5 22:04:16 2019 +0100
tdf#128288: Use DS_Store_Langpack even for --disable-release-build
(cf. ScpAction scp_Copy_Ds_Store in scp2/source/ooo/scpaction_ooo.scp
making use
of this feature)
Dev builds overruling the .DS_Store file for language-/helppacks appears to
have
been broken ever since dab79744767c05fd5268866937e225b74e658cea "Give Mac
master
builds a nice background .dmg image, too".
Change-Id: I7473d1b0b35fe0b435e7d26c0639e26ed157245d
Reviewed-on: https://gerrit.libreoffice.org/82107
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index f440132ab866..3977ab200fec 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -324,10 +324,10 @@ sub run {
my $scpactionsinproductarrayref =
installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
if ( $installer::globals::languagepack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
- if ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
+ elsif ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
# if (($installer::globals::devsnapshotbuild)) {
installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
# TODO: why is this not done in scp2 based on the value of
$(ENABLE_RELEASE_BUILD)?
- if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
+ elsif ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
