[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/inc_ooohelppack solenv/bin

[Caolán McNamara]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt |    7 +++++++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt |    7 +++++++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt |    3 +++
 solenv/bin/make_installer.pl                                        |    4 ----
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 3bb382338859eb278e4baca574ad613b348cb077
Author: Andras Timar <atimar at suse.com>
Date:   Tue Apr 10 20:45:46 2012 +0200

    fdo#48411 Find install location during help pack install
    (cherry picked from commit da2ec9aac3699c951c544a51acd6ab3aede706eb)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
new file mode 100644
index 0000000..85e9539
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
@@ -0,0 +1,7 @@
+Property	Signature_
+s72	s72
+AppSearch	Property	Signature_
+INSTALLLOCATION	installuser
+INSTALLLOCATION	installmachine
+INSTALLLOCATION	installuserdev
+INSTALLLOCATION	installmachinedev
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
new file mode 100644
index 0000000..8a15810
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
@@ -0,0 +1,7 @@
+Signature_	Root	Key	Name	Type
+s72	i2	s255	S255	I2
+RegLocator	Signature_
+installuser	1	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuserdev	1	Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachinedev	2	Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
new file mode 100644
index 0000000..5004a55
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
@@ -0,0 +1,3 @@
+Signature	FileName	MinVersion	MaxVersion	MinSize	MaxSize	MinDate	MaxDate	Languages
+s72	s255	S20	S20	I4	I4	I4	I4	S255
+Signature	Signature
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e427cd5..164e08f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2142,10 +2142,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # adding the files from the binary directory into the binary table
             installer::windows::binary::update_binary_table($languageidtdir, $filesinproductlanguageresolvedarrayref, $binarytablefiles);
 
-            # setting patch codes to detect installed products
-
-            if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $allvariableshashref->{'PDFCONVERTER'} )) { installer::windows::patch::update_patch_tables($languageidtdir, $allvariableshashref); }
-
             # Adding Windows Installer CustomActions
 
             installer::windows::idtglobal::addcustomactions($languageidtdir, $windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);