Skip to content

C
core
Kaydet (Commit) 31693b55 authored tarafından Andre Fischer's avatar Andre Fischer
Dosyalara gözat
Seçenekler

123729: Removed support for unused scp style LAYERE_REGISTRY and last uses (already commented out).

üst c9d10b16
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 83 deletions
scp2/source/ooo/registryitem_ooo.scp
Dosyayı görüntüle @ 31693b55
...@@ -325,78 +325,6 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall ...@@ -325,78 +325,6 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
Styles = (ALWAYS_REQUIRED); Styles = (ALWAYS_REQUIRED);
End 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 RegistryItem gid_Regitem_Sog
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".sog"; Subkey = ".sog";
......
solenv/bin/modules/installer/windows/registry.pm
Dosyayı görüntüle @ 31693b55
...@@ -77,17 +77,6 @@ sub get_registry_component_name ...@@ -77,17 +77,6 @@ sub get_registry_component_name
my $styles = ""; my $styles = "";
if ( $registryref->{'Styles'} ) { $styles = $registryref->{'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; $componentname = $componentname . $addon;
if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; } if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment