diff options
19 files changed, 0 insertions, 134 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt index 7263a0a9e9bb..ec6ecdd99f72 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt @@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83 RMCCPSearch OOO_ACTIONTEXT_84 Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86 RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88 -SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90 -SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92 SetODBCFolders OOO_ACTIONTEXT_93 StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95 StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt index 7d22ecbbbe1a..3d29abe02df0 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt @@ -52,8 +52,6 @@ RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 -SelfRegModules 2850 -SelfUnregModules 1100 SetARPInstallLocation 990 SetODBCFolders 550 StartServices VersionNT 2800 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt index 4098f92c3578..0759d336f290 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt @@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally. ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location. -SelfReg Cost Y 0 32767 The cost of registering the module. -SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered. ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~]. ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt index 7263a0a9e9bb..ec6ecdd99f72 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ActionTe.idt @@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83 RMCCPSearch OOO_ACTIONTEXT_84 Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86 RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88 -SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90 -SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92 SetODBCFolders OOO_ACTIONTEXT_93 StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95 StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt index 7d22ecbbbe1a..3d29abe02df0 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt @@ -52,8 +52,6 @@ RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 -SelfRegModules 2850 -SelfUnregModules 1100 SetARPInstallLocation 990 SetODBCFolders 550 StartServices VersionNT 2800 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt index 4098f92c3578..0759d336f290 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/_Validat.idt @@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally. ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location. -SelfReg Cost Y 0 32767 The cost of registering the module. -SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered. ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~]. ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf index a69af2544bfd..213f6df98f72 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/ActionTe.ulf @@ -280,18 +280,6 @@ en-US = "Removing backup files" [OOO_ACTIONTEXT_88] en-US = "File: [1]" -[OOO_ACTIONTEXT_89] -en-US = "Registering modules" - -[OOO_ACTIONTEXT_90] -en-US = "File: [1], Folder: [2]" - -[OOO_ACTIONTEXT_91] -en-US = "Unregistering modules" - -[OOO_ACTIONTEXT_92] -en-US = "File: [1], Folder: [2]" - [OOO_ACTIONTEXT_93] en-US = "Initializing ODBC directories" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt index 7263a0a9e9bb..ec6ecdd99f72 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ActionTe.idt @@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83 RMCCPSearch OOO_ACTIONTEXT_84 Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86 RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88 -SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90 -SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92 SetODBCFolders OOO_ACTIONTEXT_93 StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95 StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 115ac8778950..3da59dca9939 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -53,8 +53,6 @@ RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 -SelfRegModules 2850 -SelfUnregModules 1100 SetARPInstallLocation 990 SetODBCFolders 550 StartServices VersionNT 2800 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt index 4098f92c3578..0759d336f290 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt @@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally. ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location. -SelfReg Cost Y 0 32767 The cost of registering the module. -SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered. ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~]. ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt index 7263a0a9e9bb..ec6ecdd99f72 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ActionTe.idt @@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83 RMCCPSearch OOO_ACTIONTEXT_84 Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86 RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88 -SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90 -SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92 SetODBCFolders OOO_ACTIONTEXT_93 StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95 StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt index 5cd178ea47e3..1b416c090478 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt @@ -51,8 +51,6 @@ RemoveRegistryValues 1300 RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 ScheduleReboot ISSCHEDULEREBOOT 3125 -SelfRegModules 2850 -SelfUnregModules 1100 SetARPInstallLocation 990 SetODBCFolders 550 StartServices VersionNT 2800 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt index 4098f92c3578..0759d336f290 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt @@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally. ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location. -SelfReg Cost Y 0 32767 The cost of registering the module. -SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered. ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~]. ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt index 7263a0a9e9bb..ec6ecdd99f72 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/ActionTe.idt @@ -52,8 +52,6 @@ RemoveShortcuts OOO_ACTIONTEXT_82 OOO_ACTIONTEXT_83 RMCCPSearch OOO_ACTIONTEXT_84 Rollback OOO_ACTIONTEXT_85 OOO_ACTIONTEXT_86 RollbackCleanup OOO_ACTIONTEXT_87 OOO_ACTIONTEXT_88 -SelfRegModules OOO_ACTIONTEXT_89 OOO_ACTIONTEXT_90 -SelfUnregModules OOO_ACTIONTEXT_91 OOO_ACTIONTEXT_92 SetODBCFolders OOO_ACTIONTEXT_93 StartServices OOO_ACTIONTEXT_94 OOO_ACTIONTEXT_95 StopServices OOO_ACTIONTEXT_96 OOO_ACTIONTEXT_97 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt index c1de8e4a19fe..36b781b14224 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/InstallE.idt @@ -53,8 +53,6 @@ RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 ScheduleReboot ISSCHEDULEREBOOT 3125 -SelfRegModules 2850 -SelfUnregModules 1100 SetARPInstallLocation Not Installed 990 SetODBCFolders 550 StartServices VersionNT 2800 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt index 4098f92c3578..0759d336f290 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt @@ -387,8 +387,6 @@ ReserveCost ReserveFolder Y Identifier Name of a property whose value is as ReserveCost ReserveKey N Identifier Primary key that uniquely identifies a particular ReserveCost record ReserveCost ReserveLocal N 0 2147483647 Disk space to reserve if linked component is installed locally. ReserveCost ReserveSource N 0 2147483647 Disk space to reserve if linked component is installed to run from the source location. -SelfReg Cost Y 0 32767 The cost of registering the module. -SelfReg File_ N File 1 Identifier Foreign key into the File table denoting the module that needs to be registered. ServiceControl Arguments Y Formatted Arguments for the service. Separate by [~]. ServiceControl Component_ N Component 1 Identifier Required foreign key into the Component Table that controls the startup of the service ServiceControl Event N 0 187 Bit field: Install: 0x1 = Start, 0x2 = Stop, 0x8 = Delete, Uninstall: 0x10 = Start, 0x20 = Stop, 0x80 = Delete diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index d5d0be5a2439..e1209cac6ec8 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -77,7 +77,6 @@ use installer::windows::msp; use installer::windows::property; use installer::windows::removefile; use installer::windows::registry; -use installer::windows::selfreg; use installer::windows::shortcut; use installer::windows::strip; use installer::windows::update; @@ -1542,8 +1541,6 @@ sub main { { installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir); - installer::windows::selfreg::create_selfreg_table($filesinproductlanguageresolvedarrayref, $newidtdir); - # Adding Assemblies into the tables MsiAssembly and MsiAssemblyName dynamically installer::windows::assembly::create_msiassembly_table($filesinproductlanguageresolvedarrayref, $newidtdir); installer::windows::assembly::create_msiassemblyname_table($filesinproductlanguageresolvedarrayref, $newidtdir); diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 325ce11a5d7c..9bfe9c29886c 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -544,16 +544,6 @@ sub write_idt_header push(@{$idtref}, $oneline); } - if ( $definestring eq "selfreg" ) - { - $oneline = "File_\tCost\n"; - push(@{$idtref}, $oneline); - $oneline = "s72\tI2\n"; - push(@{$idtref}, $oneline); - $oneline = "SelfReg\tFile_\n"; - push(@{$idtref}, $oneline); - } - if ( $definestring eq "msiassembly" ) { $oneline = "Component_\tFeature_\tFile_Manifest\tFile_Application\tAttributes\n"; diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm deleted file mode 100644 index 0a34b4a0d1e3..000000000000 --- a/solenv/bin/modules/installer/windows/selfreg.pm +++ /dev/null @@ -1,79 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -package installer::windows::selfreg; - -use installer::exiter; -use installer::files; -use installer::globals; -use installer::worker; -use installer::windows::idtglobal; - -############################################################## -# Returning the cost for the selfreg table. -############################################################## - -sub get_selfreg_cost -{ - my ( $onefile ) = @_; - - return "0"; -} - -#################################################################################### -# Creating the file SelfReg.idt dynamically -# Content: -# File_ Cost -# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty -#################################################################################### - -sub create_selfreg_table -{ - my ($filesref, $basedir) = @_; - - my @selfregtable = (); - - installer::windows::idtglobal::write_idt_header(\@selfregtable, "selfreg"); - - # Registering all libraries with flag "SELFREG" - - my $selfregfiles = installer::worker::collect_all_items_with_special_flag($filesref, "SELFREG"); - - for ( my $i = 0; $i <= $#{$selfregfiles}; $i++ ) - { - my $onefile = ${$selfregfiles}[$i]; - - my %selfreg = (); - - $selfreg{'File_'} = $onefile->{'uniquename'}; - $selfreg{'Cost'} = get_selfreg_cost($onefile); - - my $oneline = $selfreg{'File_'} . "\t" . $selfreg{'Cost'} . "\n"; - - push(@selfregtable, $oneline); - } - - # Saving the file - - my $selfregtablename = $basedir . $installer::globals::separator . "SelfReg.idt"; - installer::files::save_file($selfregtablename ,\@selfregtable); - my $infoline = "Created idt file: $selfregtablename\n"; - push(@installer::globals::logfileinfo, $infoline); -} - -1;
\ No newline at end of file |