remove unused feature of generating setup.ini

4 files changed, 1 insertions, 146 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a21ac4d1fa99..53f676ad15e3 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2199,7 +2199,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         }
 
         # Creating transforms, if the installation set has more than one language
-        # renaming the msi database and generating the setup.ini file
+        # renaming the msi database
 
         my $defaultlanguage = installer::languages::get_default_language($languagesarrayref);
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 48b61cc800e1..b55bafd96d3f 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -223,7 +223,6 @@ 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 8a2fa0921f2d..a90698a5852d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1170,147 +1170,6 @@ sub rename_msi_database_in_installset
     $installer::globals::msidatabasename = $newdatabasename;
 }
 
-##########################################################################
-# Writing the databasename into the setup.ini.
-##########################################################################
-
-sub put_databasename_into_setupini
-{
-    my ($setupinifile, $allvariableshashref) = @_;
-
-    my $databasename = get_msidatabasename($allvariableshashref);
-    my $line = "database=" . $databasename . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the required msi version into setup.ini
-##########################################################################
-
-sub put_msiversion_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $msiversion = "2.0";
-    my $line = "msiversion=" . $msiversion . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productname into setup.ini
-##########################################################################
-
-sub put_productname_into_setupini
-{
-    my ($setupinifile, $allvariableshashref) = @_;
-
-    my $productname = $allvariableshashref->{'PRODUCTNAME'};
-    my $line = "productname=" . $productname . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productcode into setup.ini
-##########################################################################
-
-sub put_productcode_into_setupini
-{
-    my ($setupinifile) = @_;
-
-    my $productcode = $installer::globals::productcode;
-    my $line = "productcode=" . $productcode . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# 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
-##########################################################################
-
-sub put_languagecount_into_setupini
-{
-    my ($setupinifile, $languagesarray) = @_;
-
-    my $languagecount = $#{$languagesarray} + 1;
-    my $line = "count=" . $languagecount . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the defaultlanguage into setup.ini
-##########################################################################
-
-sub put_defaultlanguage_into_setupini
-{
-    my ($setupinifile, $defaultlanguage) = @_;
-
-    my $windowslanguage = installer::windows::language::get_windows_language($defaultlanguage);
-    my $line = "default=" . $windowslanguage . "\n";
-    push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the information about transformations into setup.ini
-##########################################################################
-
-sub put_transforms_into_setupini
-{
-    my ($setupinifile, $onelanguage, $counter) = @_;
-
-    my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
-    my $transformfilename = "trans_" . $onelanguage . ".mst";
-
-    my $line = "lang" . $counter . "=" . $windowslanguage . "," . $transformfilename . "\n";
-
-    push(@{$setupinifile}, $line);
-}
-
-###################################################
-# Including Windows line ends in ini files
-# Profiles on Windows shall have \r\n line ends
-###################################################
-
-sub include_windows_lineends
-{
-    my ($onefile) = @_;
-
-    for ( my $i = 0; $i <= $#{$onefile}; $i++ )
-    {
-        ${$onefile}[$i] =~ s/\r?\n$/\r\n/;
-    }
-}
-
 #################################################################
 # Copying the files defined as ScpActions into the
 # installation set.
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 1a777dee4262..ba9f7a8e6488 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -411,9 +411,6 @@ 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/ ))
             {