CWS-TOOLING: integrate CWS native210_DEV300

3 files changed, 33 insertions, 0 deletions

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 9122c5b0d120..72ec0830e82a 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 15b715b79ee2..1c2af45843d8 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 1c8d171fee56..3e8547c8f659 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/ ))
             {