Drop Hamburg RE updatepack stuff that we have no clue about anyway

5 files changed, 9 insertions, 220 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 4142561acc57..2bfdac88ecbd 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -134,8 +134,6 @@ installer::parameter::control_required_parameter();
 if (!($installer::globals::languages_defined_in_productlist)) { installer::languages::analyze_languagelist(); }
 installer::parameter::outputparameter();
 
-installer::control::check_updatepack();
-
 $installer::globals::build = uc($installer::globals::build);    # using "SRC680" instead of "src680"
 
 ######################################
@@ -659,8 +657,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     $installer::globals::globalinfo_copied = 1;
 
     my $logminor = "";
-    if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
-    else { $logminor = $installer::globals::minor; }
+    $logminor = $installer::globals::minor;
 
     my $loglanguagestring = $$languagestringref;
     my $loglanguagestring_orig = $loglanguagestring;
@@ -690,12 +687,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
     $installer::globals::exitlog = $loggingdir;
 
-    ##############################################################
-    # Determining the ship location, if this is an update pack
-    ##############################################################
-
-    if ( $installer::globals::updatepack ) { $shipinstalldir = installer::control::determine_ship_directory($languagestringref); }
-
     ###################################################################
     # Reading an existing msi database, to prepare update and patch
     ###################################################################
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 72d76ef38674..b0824efe996a 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -390,180 +390,6 @@ sub check_logfile
 }
 
 #############################################################
-# Determining the ship installation directory
-#############################################################
-
-sub determine_ship_directory
-{
-    my ($languagesref) = @_;
-
-    if (!( $ENV{'SHIPDRIVE'} )) { installer::exiter::exit_program("ERROR: SHIPDRIVE must be set for updater!", "determine_ship_directory"); }
-
-    my $shipdrive = $ENV{'SHIPDRIVE'};
-
-    my $languagestring = $$languagesref;
-
-    if (length($languagestring) > $installer::globals::max_lang_length )
-    {
-        my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
-        chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
-        $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
-    }
-
-    my $productstring = $installer::globals::product;
-    my $productsubdir = "";
-
-    if ( $productstring =~ /^\s*(.+?)\_\_(.+?)\s*$/ )
-    {
-        $productstring = $1;
-        $productsubdir = $2;
-    }
-
-    if ( $installer::globals::languagepack ) { $productstring = $productstring . "_languagepack"; }
-    if ( $installer::globals::helppack ) { $productstring = $productstring . "_helppack"; }
-    if ( $installer::globals::patch ) { $productstring = $productstring . "_patch"; }
-
-    my $destdir = $shipdrive . $installer::globals::separator . $installer::globals::compiler .
-                $installer::globals::productextension . $installer::globals::separator .
-                $productstring . $installer::globals::separator;
-
-    if ( $productsubdir ) { $destdir = $destdir . $productsubdir . $installer::globals::separator; }
-
-    $destdir = $destdir . $installer::globals::installertypedir . $installer::globals::separator .
-                $installer::globals::build . "_" . $installer::globals::lastminor . "_" .
-                "native_inprogress-number_" . $languagestring . "\." . $installer::globals::buildid;
-
-    my $infoline = "\nSetting ship directory: $destdir\n";
-    push(@installer::globals::globallogfileinfo, $infoline);
-
-    return $destdir;
-}
-
-#############################################################
-# Controlling if this is an official RE pack process
-#############################################################
-
-sub check_updatepack
-{
-    my $shipdrive = "";
-    my $filename = "";
-    my $infoline = "";
-
-    # the environment variable UPDATER was always set
-    {
-        $infoline = "\nEnvironment variable UPDATER set\n";
-        push(@installer::globals::globallogfileinfo, $infoline);
-
-        # There are no CWSes any more, no environment variable CWS_WORK_STAMP
-        {
-            if ( $ENV{'SHIPDRIVE'} )    # the environment variable SHIPDRIVE must be set
-            {
-                $shipdrive = $ENV{'SHIPDRIVE'};
-                $infoline = "Ship drive defined: $shipdrive\n";
-                push(@installer::globals::globallogfileinfo, $infoline);
-
-                if ( -d $shipdrive )    # SHIPDRIVE must be a directory
-                {
-                    $infoline = "Ship drive exists\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);
-
-                    # try to write into $shipdrive
-
-                    $directory = $installer::globals::product . "_" . $installer::globals::compiler . "_" . $installer::globals::buildid . "_" . $installer::globals::languageproducts[0] . "_test_$$";
-                    $directory =~ s/\,/\_/g;    # for the list of languages
-                    $directory =~ s/\-/\_/g;    # for en-US, pt-BR, ...
-                    $directory = $shipdrive . $installer::globals::separator . $directory;
-
-                    $infoline = "Try to create directory: $directory\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);
-
-                    # saving this directory for later removal
-                    $installer::globals::shiptestdirectory = $directory;
-
-                    if ( installer::systemactions::try_to_create_directory($directory))
-                    {
-                        $infoline = "Write access on Ship drive\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully created\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        my $systemcall = "rmdir $directory";
-                        my $returnvalue = system($systemcall);
-
-                        # 5th condition: No local build environment.
-                        # In this case the content of SOLARENV starts with the content of SOL_TMP
-
-                        my $solarenv = "";
-                        my $sol_tmp;
-                        if ( $ENV{'SOLARENV'} ) { $solarenv = $ENV{'SOLARENV'}; }
-
-                        $infoline = "Environment variable SOLARENV: $solarenv\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-
-                        if ( $ENV{'SOL_TMP'} )
-                        {
-                            $sol_tmp = $ENV{'SOL_TMP'};
-                            $infoline = "Environment variable SOL_TMP: $sol_tmp\n";
-                        } else {
-                            $infoline = "Environment variable SOL_TMP not set\n";
-                        }
-                        push(@installer::globals::globallogfileinfo, $infoline);
-
-                        if ( defined $sol_tmp && ( $solarenv =~ /^\s*\Q$sol_tmp\E/ ))
-                        {
-                            $infoline = "Content of SOLARENV starts with the content of SOL_TMP\: Local environment -\> No Updatepack\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            $infoline = "Content of SOLARENV does not start with the content of SOL_TMP: No local environment\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-
-                            $installer::globals::updatepack = 1;    # That's it
-                        }
-
-                        # Additional logging information for the temporary ship directory
-
-                        if ( -d $installer::globals::shiptestdirectory )
-                        {
-                            $infoline = "Ship test directory $installer::globals::shiptestdirectory still exists. Trying removal later again.\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-                        }
-                        else
-                        {
-                            $infoline = "Ship test directory $installer::globals::shiptestdirectory was successfully removed.\n";
-                            push(@installer::globals::globallogfileinfo, $infoline);
-                        }
-                    }
-                    else
-                    {
-                        $infoline = "No write access on Ship drive\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                        $infoline = "Failed to create directory $directory\n";
-                        push(@installer::globals::globallogfileinfo, $infoline);
-                    }
-                }
-                else
-                {
-                    $infoline = "Ship drive not found: No updatepack\n";
-                    push(@installer::globals::globallogfileinfo, $infoline);
-                }
-            }
-            else
-            {
-                $infoline = "Environment variable SHIPDRIVE not set: No updatepack\n";
-                push(@installer::globals::globallogfileinfo, $infoline);
-            }
-        }
-    }
-
-    if ( $installer::globals::updatepack ) { $infoline = "Setting updatepack true\n\n"; }
-    else { $infoline = "\nNo updatepack\n"; }
-    push(@installer::globals::globallogfileinfo, $infoline);
-
-}
-
-#############################################################
 # Reading the Windows list file for language encodings
 #############################################################
 
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index f7b1890cf2a8..f36b8e9c73cf 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -44,7 +44,6 @@ sub save_followme_info
     my ($finalinstalldir, $includepatharrayref, $allvariableshashref, $downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir) = @_;
 
     my $downloadinfofilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $downloadinfofilename =~ s/log_/log_$current_install_number\_/; }
     $downloadinfofilename =~ s/log_/follow_me_/;
 
     # Creating directory
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921132f3..6319276954b9 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -69,8 +69,7 @@ sub get_arpcomments_for_property_table
     $comment = $comment . " ($languagestring)";
 
     my $localminor = "";
-    if ( $installer::globals::updatepack ) { $localminor = $installer::globals::lastminor; }
-    else { $localminor = $installer::globals::minor; }
+    $localminor = $installer::globals::minor;
 
     my $buildidstring = "(" . $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . "))";
 
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index a7da80f99a64..795927482934 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -373,23 +373,12 @@ sub create_installation_directory
 
     my $languageref = $languagestringref;
 
-    if ( $installer::globals::updatepack )
-    {
-        $installdir = $shipinstalldir;
-        installer::systemactions::create_directory_structure($installdir);
-        $$current_install_number_ref = installer::systemactions::determine_maximum_number($installdir, $languageref);
-        $installdir = installer::systemactions::rename_string_in_directory($installdir, "number", $$current_install_number_ref);
-        remove_old_ship_installation_sets($installdir);
-    }
-    else
-    {
-        $installdir = installer::systemactions::create_directories("install", $languageref);
-        installer::logger::print_message( "... creating installation set in $installdir ...\n" );
-        remove_old_installation_sets($installdir);
-        my $inprogressinstalldir = $installdir . "_inprogress";
-        installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
-        $installdir = $inprogressinstalldir;
-    }
+    $installdir = installer::systemactions::create_directories("install", $languageref);
+    installer::logger::print_message( "... creating installation set in $installdir ...\n" );
+    remove_old_installation_sets($installdir);
+    my $inprogressinstalldir = $installdir . "_inprogress";
+    installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
+    $installdir = $inprogressinstalldir;
 
     $installer::globals::saveinstalldir = $installdir;  # saving directory globally, in case of exiting
 
@@ -431,20 +420,7 @@ sub analyze_and_save_logfile
     {
         my $destdir = "";
 
-        if ( $installer::globals::updatepack )
-        {
-            if ( $installdir =~ /_download_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_download_inprogress", "_download"); }
-            elsif ( $installdir =~ /_msp_inprogress/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_msp_inprogress", "_msp"); }
-            else
-            {
-                if ( $installdir =~ /_packed/ ) { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", ""); }
-                else { $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_packed"); }
-            }
-        }
-        else
-        {
-            $destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "");
-        }
+	$destdir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "");
 
         $finalinstalldir = $destdir;
     }
@@ -452,7 +428,6 @@ sub analyze_and_save_logfile
     # Saving the logfile in the log file directory and additionally in a log directory in the install directory
 
     my $numberedlogfilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
     installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
     installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
     installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
@@ -484,7 +459,6 @@ sub save_logfile_after_linking
 
     # Saving the logfile in the log file directory and additionally in a log directory in the install directory
     my $numberedlogfilename = $installer::globals::logfilename;
-    if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
     installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
     installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
     installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);