incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1310206 - /incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm
Date Fri, 06 Apr 2012 07:44:00 GMT
Author: hdu
Date: Fri Apr  6 07:43:59 2012
New Revision: 1310206

URL: http://svn.apache.org/viewvc?rev=1310206&view=rev
Log:
#i119168# refer epm-built lpacks/sdks to base package license

Modified:
    incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm?rev=1310206&r1=1310205&r2=1310206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/epmfile.pm Fri Apr  6 07:43:59 2012
@@ -387,12 +387,12 @@ sub create_epm_header
 	
 	if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
 	{
-		$licensefilename = "license.txt";
+		$licensefilename = "LICENSE.txt";
 		$readmefilename = "readme.txt";
 	}
 	else
 	{
-		$licensefilename = "LICENSE";	
+		$licensefilename = "LICENSE";
 		$readmefilename = "README";	
 	}
 	
@@ -401,12 +401,12 @@ sub create_epm_header
 	{
 		if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
 		{
-			$licensefilename = "license_$searchlanguage.txt";
+			$licensefilename = "LICENSE.txt";
 			$readmefilename = "readme_$searchlanguage.txt";
 		}
 		else
 		{
-			$licensefilename = "LICENSE_$searchlanguage";
+			$licensefilename = "LICENSE";
 			$readmefilename = "README_$searchlanguage";
 		}
 	}
@@ -490,19 +490,12 @@ sub create_epm_header
 	}
 	else
 	{
-		for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
-		{
-			my $onefile = ${$filesinproduct}[$i];
-			my $filename = $onefile->{'Name'};
-		
-			if ( $filename eq $licensefilename )
-			{
-				$foundlicensefile = 1;
-				$line = "%license" . " " . $onefile->{'sourcepath'} . "\n";
-				push(@epmheader, $line);
-				last;
-			}
-		}
+		# refer to the license in the matching AOO installation
+		# TODO: sync AOO dest license full path with lpacks/sdks/exts
+		my $licpath = "openoffice.org3/program/" . $licensefilename;
+		$foundlicensefile = 1;
+		$line = "%license " . $licpath . "\n";
+		push(@epmheader, $line);
 	}
 
 	if (!($foundlicensefile))



Mime
View raw message