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 /instsetoo_native | |
parent | Clarify intended use of these files (diff) | |
download | core-5b77c93b28b7f7b705617839eb72798568ce9f15.tar.gz core-5b77c93b28b7f7b705617839eb72798568ce9f15.zip |
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 'instsetoo_native')
4 files changed, 3 insertions, 7 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index b8a970ced0c2..9fc042166a49 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -40,7 +40,7 @@ ProgressType2 installed ProgressType3 installs RebootYesNo Yes ReinstallModeText omus -SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR +SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS SetupType Typical STR_NEW_DISPLAY_NAME OOO_STR_NEW_DISPLAY_NAME STR_EDIT OOO_STR_EDIT diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index 44d2c381c432..99238570760e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -42,7 +42,7 @@ ProgressType3 installs Quickstarterlinkname QUICKSTARTERLINKNAMETEMPLATE RebootYesNo Yes ReinstallModeText omus -SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS +SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS SetupType Typical SELECT_WORD 0 SELECT_EXCEL 0 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt index cdcaea4c609f..8848ac8e88cd 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt @@ -41,7 +41,7 @@ ProgressType2 installed ProgressType3 installs RebootYesNo Yes ReinstallModeText omus -SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR +SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS SetupType Typical STR_NEW_DISPLAY_NAME OOO_STR_NEW_DISPLAY_NAME STR_EDIT OOO_STR_EDIT diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 61d295b0691e..ffef5c7d4ae1 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -68,8 +68,6 @@ LibreOffice GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt OOODOWNLOADNAME 1 - BETAUPGRADECODE - STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -124,8 +122,6 @@ LibreOffice_Dev GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt OOODOWNLOADNAME 1 - BETAUPGRADECODE - STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt |