set download name of Windows installer

2 files changed, 11 insertions, 51 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 53f676ad15e3..6e3a68e634fa 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2311,7 +2311,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
 
         if ( $$downloadname ne "" ) { $create_download = 1; }
-        if ( $installer::globals::iswindowsbuild ) { $create_download = 0; }
+        if ( $installer::globals::iswindowsbuild )
+        {
+            $create_download = 0;
+            if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $$downloadname = installer::download::set_download_filename($languagestringref, $allvariableshashref); }
+            else { $$downloadname = installer::download::resolve_variables_in_downloadname($allvariableshashref, $$downloadname, $languagestringref); }
+	    installer::systemactions::rename_one_file( $finalinstalldir . $installer::globals::separator . $installer::globals::shortmsidatabasename, $finalinstalldir . $installer::globals::separator . $$downloadname . ".msi" );
+
+        }
         if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
         {
             my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b16a3b2aedc2..0d14737bfa6d 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -423,60 +423,13 @@ sub get_download_version
 
     my $version = "";
 
-    my $devproduct = 0;
-    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
-    if ( $devproduct )  # use "DEV300m75"
-    {
-        my $source = uc($installer::globals::build); # DEV300
-        my $localminor = "";
-        if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
-        else { $localminor = $installer::globals::lastminor; }
-        $version = $source . $localminor;
-    }
-    else  # use 3.2.0rc1
-    {
-        $version = $allvariables->{'PRODUCTVERSION'};
-        if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
-        if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
-    }
+    $version = $allvariables->{'PRODUCTVERSION'};
+    if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
+    if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
 
     return $version;
 }
 
-###############################################################
-# Set date string, format: yymmdd
-###############################################################
-
-sub set_date_string
-{
-    my ($allvariables) = @_;
-
-    my $datestring = "";
-
-    my $devproduct = 0;
-    if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
-    my $releasebuild = 1;
-    if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }
-
-    if (( ! $devproduct ) && ( ! $releasebuild ))
-    {
-        my @timearray = localtime(time);
-
-        my $day = $timearray[3];
-        my $month = $timearray[4] + 1;
-        my $year = $timearray[5] + 1900;
-
-        if ( $month < 10 ) { $month = "0" . $month; }
-        if ( $day < 10 ) { $day = "0" . $day; }
-
-        $datestring = $year . $month . $day;
-    }
-
-    return $datestring;
-}
-
 #################################################################
 # Setting the platform name for download
 #################################################################