[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo scp2/source
Mike Kaganski
mike.kaganski at collabora.com
Fri Dec 15 08:52:19 UTC 2017
instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt | 3 -
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 16 ++++------
instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt | 2 -
instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt | 3 -
scp2/source/ooo/windowscustomaction_ooo.scp | 4 +-
8 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit cfbc934609aaa303d03fd73b58bde1370ea312dc
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Thu Dec 14 08:37:45 2017 +0200
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 at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
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
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 2377f5c5661f..7959472331a0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -10,5 +10,4 @@ InstallFiles 350
InstallFinalize 400
InstallInitialize 250
InstallValidate 200
-ScheduleReboot ISSCHEDULEREBOOT 375
SetAdminInstallProperty 248
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
index 32b74d61a9f5..132df0855f18 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
@@ -16,4 +16,3 @@ RegisterExtensionInfo 350
RegisterMIMEInfo 450
RegisterProgIdInfo 400
RegisterTypeLibraries 500
-ScheduleReboot ISSCHEDULEREBOOT 675
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 602c683b85d6..8aa06a155b46 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -5,7 +5,6 @@ ISInitAllUsers 307 ALLUSERS 1
setAllUsersProfile 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
setUserProfile 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
-SetARPNoRemove 51 ARPNOREMOVE 1
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
WrongWindowsVersion 19 OOO_CUSTOMACTION_5
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 680961b4f744..0a0d60f09832 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -1,7 +1,7 @@
Action Condition Sequence
s72 S255 I2
InstallExecuteSequence Action
-AllocateRegistrySpace NOT Installed 750
+AllocateRegistrySpace Not Installed 750
AppSearch 25
BindImage 2100
CCPSearch CCP_TEST 200
@@ -9,17 +9,17 @@ CostFinalize 500
CostInitialize 350
CreateFolders 1850
CreateShortcuts 2150
-DeleteServices VersionNT 1000
+DeleteServices 1000
DuplicateFiles 2050
FileCost 400
-FindRelatedProducts NOT ISSETUPDRIVEN 100
+FindRelatedProducts 100
InstallFiles 1950
InstallFinalize 3150
InstallInitialize 700
InstallODBC 2600
-InstallServices VersionNT 2750
+InstallServices 2750
InstallValidate 650
-ISInitAllUsers VersionNT And NOT Installed And Privileged 525
+ISInitAllUsers Not Installed And Privileged 525
IsolateComponents 450
LaunchConditions 50
MigrateFeatureStates 600
@@ -52,12 +52,10 @@ 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
-StartServices VersionNT 2800
-StopServices VersionNT 950
+StartServices 2800
+StopServices 950
UnpublishComponents 850
UnpublishFeatures 900
UnregisterClassInfo 1350
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 24642ecaeb74..7a89cbcc756f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -9,7 +9,7 @@ ExecuteAction 850
FileCost 450
FindRelatedProducts 150
InstallWelcome Not Installed 650
-ISInitAllUsers VersionNT And NOT Installed And Privileged 575
+ISInitAllUsers Not Installed And Privileged 575
IsolateComponents 500
LaunchConditions 50
MaintenanceWelcome Installed And Not RESUME And Not Preselected And Not PATCH 750
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
index f62847a4b9ee..bd6c492a733a 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_sdkoo/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
@@ -50,7 +50,6 @@ RemoveODBC 1200
RemoveRegistryValues 1300
RemoveShortcuts 1600
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 250
-ScheduleReboot ISSCHEDULEREBOOT 3125
SetARPInstallLocation 990
SetARPNoRemove VersionNT < 600 995
SetODBCFolders 550
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 39a0d52cbd54..bc7201b9b2b4 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -24,7 +24,7 @@ WindowsCustomAction gid_Customaction_RenamePrgFolder
Source = "shlxtmsi.dll";
Target = "RenamePrgFolder";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
+ Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
End
WindowsCustomAction gid_Customaction_RemovePrgFolder
@@ -33,7 +33,7 @@ WindowsCustomAction gid_Customaction_RemovePrgFolder
Source = "shlxtmsi.dll";
Target = "RemovePrgFolder";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "VersionNT >= 600 And OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
+ Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
End
WindowsCustomAction gid_Customaction_Regallmsdocdll
More information about the Libreoffice-commits
mailing list