summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schmidt <is@openoffice.org>2010-11-09 13:25:59 +0100
committerIngo Schmidt <is@openoffice.org>2010-11-09 13:25:59 +0100
commitcd78195d3de8135be70f6f044adbb58283f8c3aa (patch)
tree4a98fbd94a64da3c7da41c42b8e4ae0dc63949bd
parent066088ef313f136a54273075a691e71a9b7a0552 (diff)
native346 #i115376# making update process more flexible
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt2
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt6
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt2
-rw-r--r--instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt6
4 files changed, 12 insertions, 4 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 9bb051e56..3968375a8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property Signature_
s72 s72
AppSearch Property Signature_
INSTALLLOCATION installuser
+INSTALLLOCATION installuser_
INSTALLLOCATION installmachine
+INSTALLLOCATION installmachine_
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2fb2d2963..661b9a4be 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-installuser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser 1 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
index 41ff15217..9a3dac511 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property Signature_
s72 s72
AppSearch Property Signature_
INSTALLLOCATION basisinstalluser
+INSTALLLOCATION basisinstalluser_
INSTALLLOCATION basisinstallmachine
+INSTALLLOCATION basisinstallmachine_
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 5121f7870..072fdcf6c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-basisinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2