diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:21:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 11:21:20 +0000 |
| commit | 7706e501c894cff61be0fd87edd90aa41688e4a7 (patch) | |
| tree | 7d4c6044c29b7d576bac9e3f46c75101c742f442 /solenv | |
| parent | 8774390ec49d71e194be0b13ef7ce0a111126cd4 (diff) | |
INTEGRATION: CWS native80 (1.81.6); FILE MERGED
2007/03/08 13:46:38 is 1.81.6.2: #i74224# shorter directory names
2007/03/05 16:50:27 is 1.81.6.1: #145483# removing errors in msi databases
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/make_installer.pl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 55cea76a1685..299e8afb17f4 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -4,9 +4,9 @@ # # $RCSfile: make_installer.pl,v $ # -# $Revision: 1.84 $ +# $Revision: 1.85 $ # -# last change: $Author: vg $ $Date: 2007-03-26 14:14:54 $ +# last change: $Author: rt $ $Date: 2007-04-02 12:21:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -576,6 +576,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) } my $logminor = ""; + my $avoidlanginlog = 0; if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; } else { $logminor = $installer::globals::minor; } @@ -583,13 +584,17 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::is_unix_multi ) { $loglanguagestring = $installer::globals::unixmultipath_orig; } my $loglanguagestring_orig = $loglanguagestring; - if (length($loglanguagestring) > 120) + if (length($loglanguagestring) > $installer::globals::max_lang_length) { chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`); $loglanguagestring = $shorter; + $avoidlanginlog = 1; } - $installer::globals::logfilename = "log_" . $installer::globals::build . "_" . $logminor . "_" . $loglanguagestring . ".log"; + $installer::globals::logfilename = "log_" . $installer::globals::build; + if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; } + if ( ! $avoidlanginlog ) { $installer::globals::logfilename .= "_" . $loglanguagestring; } + $installer::globals::logfilename .= ".log"; if ( $isfirstrun ) { $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator; } @@ -1710,7 +1715,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "registryitems5.log", $registryitemsinproductlanguageresolvedarrayref); } # Advising language specific files and component to the corresponding feature for multilingual installation sets - if (( $installer::globals::ismultilingual ) && ( ! $installer::globals::languagepack )) { installer::windows::feature::change_modules_in_filescollector($filesinproductlanguageresolvedarrayref); } + if (( $installer::globals::ismultilingual ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSELANGUAGEPACKFEATURE'} )) { installer::windows::feature::change_modules_in_filescollector($filesinproductlanguageresolvedarrayref); } if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles19b.log", $filesinproductlanguageresolvedarrayref); } # Attention: The table "Feature.idt" contains language specific strings -> parameter: $languagesarrayref ! |