summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2020-02-03 14:48:21 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2020-02-03 21:51:37 +0100
commit61e23146987b49617af29c745b427905752e0b16 (patch)
tree158e9f3a39b0143cfc9f50fb2fc836e033981f72 /instsetoo_native
parentb5bec747cc9af01167431f35339eff4085693ebc (diff)
Set INSTALLLOCATION in one single place
It used to be set both in AppSearch action (using RegLocator table), and in MigrateInstallPath custom action. This would overwrite value of INSTALLLOCATION taken from user, and read on the previous step, with values taken on the next step. Only migrating the install location in one single place - in custom action MigrateInstallPath - makes the process controllable. Also it allows to easily see all the various places in registry we read. Change-Id: Ib7e04c26e71ba92c6a62a0511971bfb3bdb7db72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87867 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt4
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt4
2 files changed, 0 insertions, 8 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index cb0ca0c1ccbb..0a5b68ed4186 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -1,9 +1,5 @@
Property Signature_
s72 s72
AppSearch Property Signature_
-INSTALLLOCATION installuser
-INSTALLLOCATION installuser_
-INSTALLLOCATION installmachine
-INSTALLLOCATION installmachine_
WIN81S14 win81s14
WINMAJORVER WinMajorVer
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 7788815d3a6e..59aed91a014d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,8 +1,4 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-installuser 1 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installuser_ 1 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine_ 2 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
WinMajorVer 2 Software\Microsoft\Windows NT\CurrentVersion CurrentMajorVersionNumber 2