diff options
| author | Andras Timar <atimar@suse.com> | 2013-04-25 01:54:20 -0700 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-04-30 01:23:35 -0700 |
| commit | 5b77c93b28b7f7b705617839eb72798568ce9f15 (patch) | |
| tree | a8326201b69f4374104894ed4ecade95d51e2c60 /scp2 | |
| parent | 0e881978998e9b17495a63de3bb9e22aa1474066 (diff) | |
remove unused product variables from Windows installer
OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete
SAMEPRODUCTS - same product have the same ProductCode, so installer detect it
anyway under normal circumstances. It is possible that a tester/developer tries
to install the same version with different ProductCode over an existing installation
(e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was not in use.
Moreover, Windows Installer uses only the first three fields of the product version.
So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is the new versioning
scheme.
BETAPRODUCTS - LibreOffice have never used different upgrade code (BETAUPGRADECODE) for betas.
OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star Division patching
mechanism, they were commented out anyway.
STUBPRODUCTS, STUBUPGRADECODE - these look useless
Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/windowscustomaction_ooo.scp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 31b133f79d9f..bf14fe606412 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder Source = "shlxtmsi.dll"; Target = "RenamePrgFolder"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); + Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); End WindowsCustomAction gid_Customaction_RemovePrgFolder @@ -42,7 +42,7 @@ WindowsCustomAction gid_Customaction_RemovePrgFolder Source = "shlxtmsi.dll"; Target = "RemovePrgFolder"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "end"); + Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end"); End WindowsCustomAction gid_Customaction_Regallmsdocdll |