CWS-TOOLING: integrate CWS native210_DEV300

8 files changed, 57 insertions, 0 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 3e4864e84..29325b2bd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -3,3 +3,6 @@ en-US  = "A newer version of [ProductName] was found. To install an older versio
 
 [OOO_CUSTOMACTION_2]
 en-US  = "The same version of this product is already installed."
+
+[OOO_CUSTOMACTION_3]
+en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index e3bb73b9e..93411143a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -41,6 +41,7 @@ SetOfficeInstallLocation	51	OFFICEINSTALLLOCATION	[OFFICEDIRECTORYGID]
 SetBasisInstallLocation	51	BASISINSTALLLOCATION	[BASISDIRECTORYGID]
 SetUreInstallLocation	51	UREINSTALLLOCATION	[UREDIRECTORYGID]
 NewProductFound	19		OOO_CUSTOMACTION_1
+OldProductFound	19		OOO_CUSTOMACTION_3
 SameProductFound	19		OOO_CUSTOMACTION_2
 SetLanguageSelected	51	LANG_SELECTED	1
 ResetLanguageSelected	51	LANG_SELECTED	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index dc528293b..4626b220e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -58,6 +58,7 @@ MoveFiles		1900
 MsiPublishAssemblies		3025
 MsiUnpublishAssemblies		875
 NewProductFound	NEWPRODUCTS	110
+OldProductFound	OLDPRODUCTSSAMEMAJOR And (VersionNT > 599)	115
 PatchFiles		2000
 ProcessComponents		800
 PublishComponents		3000
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 135987f10..1ccec5fa5 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -15,6 +15,7 @@ LaunchConditions		50
 MaintenanceWelcome	Installed And Not RESUME And Not Preselected And Not PATCH	750
 MigrateFeatureStates		600
 NewProductFound	NEWPRODUCTS	160
+OldProductFound	OLDPRODUCTSSAMEMAJOR And (VersionNT > 599)	165
 PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
 ResolveSource	Not Installed And Not PATCH	525
 RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6202b67dc..4e34805e3 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -278,6 +278,15 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[OFFICEINSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "ProductVersion";
+	Value = "[ProductVersion]";
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
 End
 
@@ -290,6 +299,15 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
 End
 
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "ProductVersion";
+	Value = "[ProductVersion]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+End
+
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
 	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index e96b8c0bc..4f8f88b78 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -161,6 +161,7 @@ BEGIN
     @linuxlinks = ();
     @linkrpms = ();
     $archiveformat = "";
+    $minorupgradekey = "";
     $updatelastsequence = 0;
     $updatesequencecounter = 0;
     $updatedatabase = 0;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 3235f9d06..8f6c54144 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1232,6 +1232,33 @@ sub put_productcode_into_setupini
 }
 
 ##########################################################################
+# Writing the ProductVersion from Property table into setup.ini
+##########################################################################
+
+sub put_productversion_into_setupini
+{
+    my ($setupinifile) = @_;
+    
+    my $line = "productversion=" . $installer::globals::msiproductversion . "\n";	
+    push(@{$setupinifile}, $line);
+}
+
+##########################################################################
+# Writing the key for Minor Upgrades into setup.ini
+##########################################################################
+
+sub put_upgradekey_into_setupini
+{
+    my ($setupinifile) = @_;
+    
+    if ( $installer::globals::minorupgradekey ne "" )
+    {
+        my $line = "upgradekey=" . $installer::globals::minorupgradekey . "\n";	
+        push(@{$setupinifile}, $line);
+    }
+}
+
+##########################################################################
 # Writing the number of languages into setup.ini
 ##########################################################################
 
@@ -1313,6 +1340,8 @@ sub create_setup_ini
     put_msiversion_into_setupini($setupinifile);
     put_productname_into_setupini($setupinifile, $allvariableshashref);
     put_productcode_into_setupini($setupinifile);
+    put_productversion_into_setupini($setupinifile);
+    put_upgradekey_into_setupini($setupinifile);
     
     $line = "\[languages\]\n";
     push(@setupinifile, $line);
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index a00f2a3fc..05d586d64 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -314,6 +314,9 @@ sub create_registry_table
             if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
             if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
 
+            # Saving upgradekey to write this into setup.ini for minor upgrades
+            if ( $style =~ /\bUPGRADEKEY\b/ ) { $installer::globals::minorupgradekey = $registry{'Key'}; }
+
             # Collecting all registry components with ALWAYS_REQUIRED style
             if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
             {