diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-14 08:37:45 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-12-15 09:49:08 +0100 |
| commit | cfbc934609aaa303d03fd73b58bde1370ea312dc (patch) | |
| tree | 73bd98eceacf3e494507366ffbe06a6fd5dbac63 /instsetoo_native/inc_ooohelppack | |
| parent | clang-format: restore lost warning on touching formatted file without check (diff) | |
| download | core-cfbc934609aaa303d03fd73b58bde1370ea312dc.tar.gz core-cfbc934609aaa303d03fd73b58bde1370ea312dc.zip | |
MSI cleanup: remove redundant conditions
VersionNT is now always greated than 600 (only needs checking in version
checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to
InstallShield and aren't relevant to LibreOffice installer.
Change-Id: I6cb769c863e09f1568ae895a6cfbb0e5940c2486
Reviewed-on: https://gerrit.libreoffice.org/46434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native/inc_ooohelppack')
| -rw-r--r-- | instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt index b30ebc27d9f6..d4f1c0f9a9e5 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt @@ -12,7 +12,7 @@ CreateShortcuts 2150 DeleteServices VersionNT 1000 DuplicateFiles 2050 FileCost 400 -FindRelatedProducts NOT ISSETUPDRIVEN 100 +FindRelatedProducts 100 InstallFiles 1950 InstallFinalize 3150 InstallInitialize 700 @@ -51,7 +51,6 @@ RemoveRegistryValues 1300 RemoveShortcuts 1600 RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250 SameProductFound SAMEPRODUCTS 120 -ScheduleReboot ISSCHEDULEREBOOT 3125 SetARPInstallLocation 990 SetARPNoRemove VersionNT < 600 995 SetODBCFolders 550 |