strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS soc (1.27.172); FILE MERGED

Browse source 
2006/03/02 11:25:47 is 1.27.172.1: #132603#, #132604# new products starofficeserver with subfolder structure
This commit is contained in:
Jens-Heiner Rechtien 2006-05-08 14:28:51 +00:00
parent 808ce4810d
commit e39392e1df
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
solenv/bin/modules/installer/control.pm
View file

@ -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;