diff options
author | Andras Timar <atimar@suse.com> | 2011-12-04 23:58:28 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-12-04 23:59:03 +0100 |
commit | e286a56ecfc0e9312cc63658e3055aea5995c6f6 (patch) | |
tree | acf498ac4d7f339e236dd865245b73c7b926b480 /solenv/bin/make_installer.pl | |
parent | remove unused feature of generating setup.ini (diff) | |
download | core-e286a56ecfc0e9312cc63658e3055aea5995c6f6.tar.gz core-e286a56ecfc0e9312cc63658e3055aea5995c6f6.zip |
set download name of Windows installer
Diffstat (limited to 'solenv/bin/make_installer.pl')
-rw-r--r-- | solenv/bin/make_installer.pl | 9 |
1 files changed, 8 insertions, 1 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); |