Author: af
Date: Mon Nov 25 14:32:18 2013
New Revision: 1545298
URL: http://svn.apache.org/r1545298
Log:
123729: Removed support for unused scp style LAYERE_REGISTRY and last uses
(already commented out).
Modified:
openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp
openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm
Modified: openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp?rev=1545298&r1=1545297&r2=1545298&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/registryitem_ooo.scp Mon Nov 25
14:32:18 2013
@@ -325,78 +325,6 @@ RegistryItem gid_Regitem_Software_OpenOf
Styles = (ALWAYS_REQUIRED);
End
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
-//End
-
-//RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "BASISINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]Basis\\";
-// Styles = (ALWAYS_REQUIRED);
-//End
-
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-//End
-
-//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
-//End
-
-//RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
-// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-// Subkey =
"Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
-// ModuleID = gid_Module_Root;
-// Name = "UREINSTALLLOCATION";
-// Value = "[INSTALLLOCATION]URE\\";
-// Styles = (ALWAYS_REQUIRED);
-//End
-
RegistryItem gid_Regitem_Sog
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".sog";
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm?rev=1545298&r1=1545297&r2=1545298&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm Mon
Nov 25 14:32:18 2013
@@ -77,17 +77,6 @@ sub get_registry_component_name
my $styles = "";
if ( $registryref->{'Styles'} ) { $styles = $registryref->{'Styles'}; }
- # Layer links must have unique Component GUID for all products. This is
necessary, because only the
- # uninstallation of the last product has to delete registry keys.
- if ( $styles =~ /\bLAYER_REGISTRY\b/ )
- {
- $componentname = "g_m_root_registry_layer_ooo_reglayer";
- # Styles USE_URELAYERVERSION, USE_OOOBASEVERSION
- if ( $styles =~ /\bUSE_URELAYERVERSION\b/ ) { $addon = "_ure_"
. $allvariables->{'URELAYERVERSION'}; }
- if ( $styles =~ /\bUSE_OOOBASEVERSION\b/ ) { $addon = "_basis_"
. $allvariables->{'OOOBASEVERSION'}; }
- $addon =~ s/\.//g;
- }
-
$componentname = $componentname . $addon;
if (( $styles =~ /\bLANGUAGEPACK\b/ ) && (
$installer::globals::languagepack )) { $componentname = $componentname .
"_lang"; }
