diff options
Diffstat (limited to 'solenv/bin/make_installer.pl')
| -rw-r--r-- | solenv/bin/make_installer.pl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 8d1dbed78b97..eefe7930afb3 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -8,8 +8,6 @@ # # $RCSfile: make_installer.pl,v $ # -# $Revision: 1.121 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -412,6 +410,9 @@ if ( $installer::globals::globallogging ) { installer::files::save_array_of_hash if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); } if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1a.log", $dirsinproductarrayref); } +if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, $allvariableshashref->{'OFFICEDIRECTORYNAME'}); } +if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); } + installer::scriptitems::resolve_all_directory_names($dirsinproductarrayref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2.log", $dirsinproductarrayref); } @@ -1359,7 +1360,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # try it again later. #################################################### - if (( $installer::globals::patch ) || ( $installer::globals::languagepack )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } + if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } if ( $allvariableshashref->{'POOLPRODUCT'} ) { @@ -1809,6 +1810,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) chdir($currentdir); # changing back into start directory } + if (( $installer::globals::issolarispkgbuild ) && ( $allvariableshashref->{'COLLECT_PKGMAP'} )) { installer::worker::collectpackagemaps($installdir, $languagestringref, $allvariableshashref); } + ####################################################### # Analyzing the log file ####################################################### @@ -2219,14 +2222,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) } # Analyzing the ScpActions and copying the files into the installation set - # At least the loader, instmsia.exe and instmsiw.exe + # At least the loader.exe installer::logger::print_message( "... copying files into installation set ...\n" ); # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref); installer::worker::put_scpactions_into_installset($installdir); - # ... copying the setup.exe, instmsia.exe and instmsiw.exe + # ... copying the setup.exe installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref); @@ -2298,7 +2301,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Creating Windows msp patches ####################################################### - if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} ) && ( ! ( $^O =~ /cygwin/i ))) # not supported for cygwin yet + if (( $is_success ) && ( $installer::globals::updatedatabase ) && ( $allvariableshashref->{'CREATE_MSP_INSTALLSET'} )) { # Required: # Temp path for administrative installations: $installer::globals::temppath |