solenv/bin/modules/installer.pm | 6 ------
solenv/bin/modules/installer/globals.pm | 1 -
2 files changed, 7 deletions(-)
New commits:
commit 917fd665d08c7934c79ca35dc0c7d79129328fc4
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Nov 5 22:09:11 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Nov 5 22:51:40 2019 +0100
Remove unused devsnapshotbuild code
...which had been introduced, already unused, with
1e4422a4b4c443c286c90853f50b739a67ce5d1f "re-base on ALv2 code. Includes:"
Change-Id: I5a26d7365c510e861bd25e0882cfe7292695107c
Reviewed-on: https://gerrit.libreoffice.org/82108
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 3977ab200fec..7f18a572cbcb 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -232,11 +232,6 @@ sub run {
if ( $installer::globals::iswindowsbuild ) {
installer::control::read_lcidlist($includepatharrayref); }
- ####################################################################
- # MacOS dmg build requires special DS_Store file to arrange icons
- ####################################################################
- # if (($installer::globals::ismacdmgbuild) &&
($installer::globals::product eq "OpenOffice_Dev")) {
$installer::globals::devsnapshotbuild = 1; }
-
#####################################################################
# Including additional inc files for variable settings, if defined
#####################################################################
@@ -325,7 +320,6 @@ sub run {
if ( $installer::globals::languagepack ) {
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)?
elsif ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index a7ec5e50b209..2309a3781b4e 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -182,7 +182,6 @@ BEGIN
$is_simple_packager_project = 0;
$patch_user_dir = 0;
$languagepack = 0;
- $devsnapshotbuild = 0;
$helppack = 0;
$refresh_includepaths = 0;
$include_paths_read = 0;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
