strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windows packaging: remove unused msp creation

Browse source 
Change-Id: I71903967f89d968d963f66a3e160d6dead7757f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138011
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2022-08-09 12:12:09 +02:00
parent de3fcf4bea
commit fcfb30e81a
3 changed files with 0 additions and 1281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
instsetoo_native/util/openoffice.lst.in
View file

@ -27,7 +27,6 @@ Globals
REGISTRYLAYERNAME Layers REGISTRYLAYERNAME Layers
SERVICEPACK 1 SERVICEPACK 1
UPDATE_DATABASE 1 UPDATE_DATABASE 1
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL 8 WINDOWSPATCHLEVEL 8

16
solenv/bin/modules/installer.pm
View file

@ -63,7 +63,6 @@ use installer::windows::media;
use installer::windows::mergemodule; use installer::windows::mergemodule;
use installer::windows::msiglobal; use installer::windows::msiglobal;
use installer::windows::msishortcutproperty; use installer::windows::msishortcutproperty;
use installer::windows::msp;
use installer::windows::property; use installer::windows::property;
use installer::windows::removefile; use installer::windows::removefile;
use installer::windows::registry; use installer::windows::registry;
@ -1631,21 +1630,6 @@ sub run {
installer::worker::clean_output_tree(); # removing directories created in the output tree installer::worker::clean_output_tree(); # removing directories created in the output tree
($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number); ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $installdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
#######################################################
# Creating Windows msp patches
#######################################################
if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} ))
{
# Required:
# Temp path for administrative installations: $installer::globals::temppath
# Path of new installation set: $finalinstalldir
# Path of old installation set: $installer::globals::updatedatabasepath
my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref);
($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
installer::worker::clean_output_tree(); # removing directories created in the output tree
}
####################################################### #######################################################
# Creating download installation set # Creating download installation set
####################################################### #######################################################

1264
solenv/bin/modules/installer/windows/msp.pm
View file

File diff suppressed because it is too large Load diff