diff options
Diffstat (limited to 'solenv/bin/make_download.pl')
| -rw-r--r-- | solenv/bin/make_download.pl | 69 |
1 files changed, 40 insertions, 29 deletions
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl index d39d42f2c..96a152a83 100644 --- a/solenv/bin/make_download.pl +++ b/solenv/bin/make_download.pl @@ -52,6 +52,7 @@ use installer::windows::sign; installer::downloadsigner::getparameter(); installer::downloadsigner::checkparameter(); +my $temppath = installer::downloadsigner::set_temp_path(); my $infofilelist = installer::downloadsigner::createproductlist(); installer::downloadsigner::publishproductlist($infofilelist); @@ -62,19 +63,21 @@ foreach my $infofilename ( @{$infofilelist} ) my $success = 1; my $do_copy = 1; my $followmeinfohash = installer::followme::read_followme_info($infofilename); - installer::downloadsigner::setlogfilename(); + installer::downloadsigner::setlogfilename(); # Successful after reading followme file, resetting log file + if ( $installer::globals::writetotemp ) { installer::downloadsigner::set_output_pathes_to_temp($followmeinfohash, $temppath); } + if ( $installer::globals::useminor ) { installer::downloadsigner::set_minor_into_pathes($followmeinfohash, $temppath); } if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) { installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" ); } - installer::logger::include_header_into_logfile("Reading include pathes"); - installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'}); + # installer::logger::include_header_into_logfile("Reading include pathes"); + # installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'}); if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) { - $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy); + $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath); ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'}, $followmeinfohash->{'finalinstalldir'}, @@ -86,37 +89,45 @@ foreach my $infofilename ( @{$infofilelist} ) if ( ! $success ) { installer::exiter::exit_program("ERROR: Signing installation set failed: $followmeinfohash->{'finalinstalldir'}", "Main"); } } - $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'}, - $followmeinfohash->{'includepatharray'}, - $followmeinfohash->{'allvariableshash'}, - $followmeinfohash->{'downloadname'}, - \$followmeinfohash->{'languagestring'}, - $followmeinfohash->{'languagesarray'}); - - ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'}, - $followmeinfohash->{'finalinstalldir'}, - $followmeinfohash->{'installlogdir'}, - "", - \$followmeinfohash->{'languagestring'}, - $followmeinfohash->{'currentinstallnumber'}); - - if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) + if ( ! $installer::globals::nodownload ) { - $do_copy = 0; - $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy); - - $followmeinfohash->{'finalinstalldir'} = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'}, - $followmeinfohash->{'finalinstalldir'}, - $followmeinfohash->{'installlogdir'}, - "", - \$followmeinfohash->{'languagestring'}, - $followmeinfohash->{'currentinstallnumber'}); + $followmeinfohash->{'finalinstalldir'} = installer::download::create_download_sets($followmeinfohash->{'finalinstalldir'}, + $followmeinfohash->{'includepatharray'}, + $followmeinfohash->{'allvariableshash'}, + $followmeinfohash->{'downloadname'}, + \$followmeinfohash->{'languagestring'}, + $followmeinfohash->{'languagesarray'}); + + ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'}, + $followmeinfohash->{'finalinstalldir'}, + $followmeinfohash->{'installlogdir'}, + "", + \$followmeinfohash->{'languagestring'}, + $followmeinfohash->{'currentinstallnumber'}); + + if (( $success ) && ( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) + { + $do_copy = 0; + $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath); + + ($success, $followmeinfohash->{'finalinstalldir'}) = installer::worker::analyze_and_save_logfile($followmeinfohash->{'loggingdir'}, + $followmeinfohash->{'finalinstalldir'}, + $followmeinfohash->{'installlogdir'}, + "", + \$followmeinfohash->{'languagestring'}, + $followmeinfohash->{'currentinstallnumber'}); + } + } + + if ( $success ) + { + installer::worker::clean_output_tree(); + if ( $installer::globals::followme_from_directory ) { installer::downloadsigner::rename_followme_infofile($infofilename); } } installer::logger::stoptime(); } - #################################### # Main program end #################################### |