Kaydet (Commit) b7285a41 authored tarafından Herbert Dürr's avatar Herbert Dürr

#i119168# refer epm-built lpacks/sdks to base package license

üst acb2b244
...@@ -387,7 +387,7 @@ sub create_epm_header ...@@ -387,7 +387,7 @@ sub create_epm_header
if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 ) if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
{ {
$licensefilename = "license.txt"; $licensefilename = "LICENSE.txt";
$readmefilename = "readme.txt"; $readmefilename = "readme.txt";
} }
else else
...@@ -401,12 +401,12 @@ sub create_epm_header ...@@ -401,12 +401,12 @@ sub create_epm_header
{ {
if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 ) if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
{ {
$licensefilename = "license_$searchlanguage.txt"; $licensefilename = "LICENSE.txt";
$readmefilename = "readme_$searchlanguage.txt"; $readmefilename = "readme_$searchlanguage.txt";
} }
else else
{ {
$licensefilename = "LICENSE_$searchlanguage"; $licensefilename = "LICENSE";
$readmefilename = "README_$searchlanguage"; $readmefilename = "README_$searchlanguage";
} }
} }
...@@ -490,19 +490,12 @@ sub create_epm_header ...@@ -490,19 +490,12 @@ sub create_epm_header
} }
else else
{ {
for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ ) # refer to the license in the matching AOO installation
{ # TODO: sync AOO dest license full path with lpacks/sdks/exts
my $onefile = ${$filesinproduct}[$i]; my $licpath = "openoffice.org3/program/" . $licensefilename;
my $filename = $onefile->{'Name'}; $foundlicensefile = 1;
$line = "%license " . $licpath . "\n";
if ( $filename eq $licensefilename ) push(@epmheader, $line);
{
$foundlicensefile = 1;
$line = "%license" . " " . $onefile->{'sourcepath'} . "\n";
push(@epmheader, $line);
last;
}
}
} }
if (!($foundlicensefile)) if (!($foundlicensefile))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment