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

INTEGRATION: CWS native141 (1.17.24); FILE MERGED

Browse source 
2008/04/09 12:50:52 is 1.17.24.2: #i88088# performance improvement patch
2008/04/03 08:41:18 is 1.17.24.1: #i87732# version number in package names
This commit is contained in:
Vladimir Glazounov 2008-04-15 13:49:41 +00:00
parent e54d1c372c
commit b8c11fb815
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
solenv/bin/modules/installer/setupscript.pm
View file

@ -8,7 +8,7 @@
#
# $RCSfile: setupscript.pm,v $
#
# $Revision: 1.18 $
# $Revision: 1.19 $
#
# This file is part of OpenOffice.org.
#
@ -172,6 +172,18 @@ sub add_lowercase_productname_setupscriptvariable
my $newline = "\%LCPRODUCTEXTENSION " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
}
elsif ( $key eq "PRODUCTVERSION" )
{
$value =~ s/\.//g;
my $newline = "\%WITHOUTDOTPRODUCTVERSION " . $value . "\n";
push(@{$variablesref} ,$newline);
}
elsif ( $key eq "OOOBASEVERSION" )
{
$value =~ s/\.//g;
my $newline = "\%WITHOUTDOTOOOBASEVERSION " . $value . "\n";
push(@{$variablesref} ,$newline);
}
}
}
@ -224,6 +236,18 @@ sub replace_all_setupscriptvariables_in_script
{
my ( $scriptref, $variablesref ) = @_;
# make hash of variables to be substituted if they appear in the script
my %subs;
for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
{
my $variableline = ${$variablesref}[$j];
if ( $variableline =~ /^\s*(\%\w+?)\s+(.*?)\s*$/ )
{
$subs{$1}= $2;
}
}
for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
{
my $line = ${$scriptref}[$i];
@ -232,20 +256,10 @@ sub replace_all_setupscriptvariables_in_script
{
# Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc"
for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
foreach my $key ( keys %subs )
{
my $variableline = ${$variablesref}[$j];
my ($key, $value);
if ( $variableline =~ /^\s*(\%\w+?)\s+(.*?)\s*$/ )
{
$key = $1;
$value = $2;
}
$line =~ s /$key/$value/g;
my $value = $subs{$key};
$line =~ s/$key/$value/g;
${$scriptref}[$i] = $line;
}
}