diff options
author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-12 17:35:52 +0100 |
---|---|---|
committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-22 09:33:52 +0100 |
commit | 007a0ddeb02188a207b40b9a4438a37aebd81b60 (patch) | |
tree | b3cb4c86163dd68dc826f2d33c509bc9c922885b /scp2 | |
parent | 8fc46ffb0e7ecdd6975516ecc722d477fb0b29ad (diff) |
Remove (Windows-only) INIFILETABLE entries from setup.ini
(See a31f334d36b5735ba6fc8d0f89e834a73bdcc561 "Windows MAR update issues with
program/{setup,version}.ini" for why this cleanup is needed.)
It is unclear to me why these entries would be needed in the setup.ini file.
The *INSTALLLOCATION values are also stored in the Windows registry (see
scp2/source/ooo/registryitem_ooo.scp). FINDPRODUCT was once used as a
GetMsiProperty, in code meanwhile removed in
030124d836a3f8571e26c8ce6b5d752ca7ab2511 "remove CustomAction
ExecutePostUninstallScript" (so I also removed the FINDPRODUCT property file
line from solenv/bin/modules/installer/windows/property.pm, so FINDPRODUCT will
no longer in the MSI Property table). ALLUSERS is only used with some
SetMsiPropertyW/UnsetMsiPropertyW/IsSetMsiPropertyW/GetMsiPropertySetW code in
setup_native/source/win32/customactions/, but that should be unrelated to the
setup.ini file.
Removing the ProfileItems from scp2/source/ooo/common_brand.scp removed the only
uses of the INIFILETABLE style, so also remove the corresponding code from
solenv/bin/modules/installer.pm and the complete related
solenv/bin/modules/installer/windows/inifile.pm. Fingers crossed.
A# modified: scp2/source/ooo/common_brand.scp
Change-Id: If2aa72f0da50bc72f8c873df713340a142eed5e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161981
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d5eecd354e0a..5da3647c2ced 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -777,34 +777,6 @@ ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap End #endif -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Alluserset - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "ALLUSERS"; - Value = "[ALLUSERS]"; - Inifiletablekey = "AllUsersSet"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Findproduct - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 5; - Key = "FINDPRODUCT"; - Value = "[FINDPRODUCT]"; - Inifiletablekey = "FindProductSet"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - ProfileItem gid_Brand_Profileitem_Setup_Buildid ProfileID = gid_Brand_Profile_Setup_Ini; ModuleID = gid_Module_Root_Brand; @@ -813,59 +785,3 @@ ProfileItem gid_Brand_Profileitem_Setup_Buildid Key = "buildid"; Value = "<buildid>"; End - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Ureinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Inifiletablekey = "UreInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Basisinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "BasisInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Officeinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "OFFICEINSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "OfficeInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Install - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "INSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "InstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif |