instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 1 +
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1 +
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 007283a49efed964a9e5801989cb3cdbbba89125
Author: Andras Timar <ati...@suse.com>
Date: Mon Apr 29 22:08:13 2013 +0200
property REINSTALL should be set only when we apply a PATCH
with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced
REINSTALL=ALL in the Property table, because without this MSP
patches did not work as expected -- some files were not patched.
I found "The file represented by File table key 'foo.bar' has
no eligible binary patches" lines in the log, and I did not find
a better solution. I'll revisit the problem later, maybe file versioning
can be changed. Windows Installer usually ignores the fourth digit in
version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 ->
3.6.10.520).
However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back.
Windows Installer passes REMOVE=ALL argument to 3.6 package, but
REINSTALL=ALL
takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0
both will be installed, there will be an entry for each in Add/Remove
Programs
Control Panel applet.
So I made REINSTALL=ALL conditional, and as a side effect, normal MSI
packages built from PTF branches will be fully useable again. If REINSTALL
is set for a product that is yet to be installed, no installation action
will take place at all. It really makes sense to selectively enable it
only for patches. I'm sorry that I did not figure this out earlier.
Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index dd128b2..3a4c106 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -12,3 +12,4 @@ SetLanguageSelected 51 LANG_SELECTED 1
ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1
ResetApplicationSelected 51 APP_SELECTED 0
+PatchInstall 51 REINSTALL ALL
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 115ac87..bda85c7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -15,6 +15,7 @@ FileCost 400
FindRelatedProducts NOT ISSETUPDRIVEN 100
InstallFiles 1950
InstallFinalize 3150
+PatchInstall PATCH 699
InstallInitialize 700
InstallODBC 2600
InstallServices VersionNT 2750
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 061c335..d19f530 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -42,7 +42,6 @@ ProgressType3 installs
Quickstarterlinkname QUICKSTARTERLINKNAMETEMPLATE
RebootYesNo Yes
ReinstallModeText omus
-REINSTALL ALL
SecureCustomProperties
NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS
SetupType Typical
SELECT_WORD 0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
