diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:28:51 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 14:28:51 +0000 |
| commit | e39392e1dfefca5d5b52de062898475e178a1d23 (patch) | |
| tree | 5946b1f3433467c5ce19eed79c3f73aeaf650afd /solenv/bin/modules/installer/control.pm | |
| parent | 808ce4810dae7c7f2dcf1d29212428a646561692 (diff) | |
INTEGRATION: CWS soc (1.27.172); FILE MERGED
2006/03/02 11:25:47 is 1.27.172.1: #132603#, #132604# new products starofficeserver with subfolder structure
Diffstat (limited to 'solenv/bin/modules/installer/control.pm')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 5d1879d3698c..4a1ced207127 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -4,9 +4,9 @@ # # $RCSfile: control.pm,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: rt $ $Date: 2005-11-09 09:09:14 $ +# last change: $Author: hr $ $Date: 2006-05-08 15:28:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -359,13 +359,24 @@ sub determine_ship_directory if ( $installer::globals::is_unix_multi ) { $languagestring = $installer::globals::unixmultipath; } my $productstring = $installer::globals::product; + my $productsubdir = ""; + + if ( $productstring =~ /^\s*(.+?)\_\_(.+?)\s*$/ ) + { + $productstring = $1; + $productsubdir = $2; + } + if (( $installer::globals::languagepack ) && ( ! $installer::globals::is_unix_multi )) { $productstring = $productstring . "_languagepack"; } if ( $installer::globals::patch ) { $productstring = $productstring . "_patch"; } my $destdir = $shipdrive . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension . $installer::globals::separator . - $productstring . $installer::globals::separator . - $installer::globals::installertypedir . $installer::globals::separator . + $productstring . $installer::globals::separator; + + if ( $productsubdir ) { $destdir = $destdir . $productsubdir . $installer::globals::separator; } + + $destdir = $destdir . $installer::globals::installertypedir . $installer::globals::separator . $installer::globals::build . "_" . $installer::globals::lastminor . "_" . "native_inprogress-number_" . $languagestring . "\." . $installer::globals::buildid; |