svn commit: r1310178 - in /incubator/ooo/trunk/main: scp2/source/sdkoo/sdkoo.scp solenv/bin/modules/installer/globals.pm solenv/bin/modules/installer/languagepack.pm solenv/bin/modules/installer/worker.pm

[hdu]

Author: hdu
Date: Fri Apr  6 06:06:17 2012
New Revision: 1310178

URL: http://svn.apache.org/viewvc?rev=1310178&view=rev
Log:
#i119168# use generic LICENSE file for langpacks and sdks

Modified:
    incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp
    incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm
    incubator/ooo/trunk/main/solenv/bin/modules/installer/languagepack.pm
    incubator/ooo/trunk/main/solenv/bin/modules/installer/worker.pm

Modified: incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp?rev=1310178&r1=1310177&r2=1310178&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/sdkoo/sdkoo.scp Fri Apr  6 06:06:17 
2012
@@ -93,14 +93,14 @@ End
 
 #if defined MACOSX
 ScpAction scp_Copy_License_Txt_Sdk
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
+    Copy = "LICENSE";
+    Name = "LICENSE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End
 ScpAction scp_Copy_Notice_Txt_Sdk
-    README_ALL_LANG(Copy, NOTICE);
-    README_ALL_LANG(Name, NOTICE);
+    Copy = "NOTICE";
+    Name = "NOTICE";
     Styles = (SCPZIP_REPLACE);
     Subdir = "LICENSEs";
 End

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1310178&r1=1310177&r2=1310178&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/globals.pm Fri Apr  6 
06:06:17 2012
@@ -193,7 +193,7 @@ BEGIN
        %alllangmodules = ();
        $englishlicenseset = 0;
        $englishlicense = "";
-       $englishsolarislicensename = "LICENSE_en-US";
+       $englishsolarislicensename = "LICENSE";
        $solarisdontcompress = 0;
        $patharray = "";
        

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/languagepack.pm
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/languagepack.pm?rev=1310178&r1=1310177&r2=1310178&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/languagepack.pm 
(original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/languagepack.pm Fri 
Apr  6 06:06:17 2012
@@ -515,7 +515,7 @@ sub build_installer_for_languagepack
 
        # find and read english license file
        my $licenselanguage = "en-US";                                  # 
always english !
-       my $licensefilename = "LICENSE_" . $licenselanguage;
+       my $licensefilename = "LICENSE";
        my $licenseincludepatharrayref = 
installer::worker::get_language_specific_include_pathes($includepatharrayref, 
$licenselanguage);
 
        my $licenseref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename,
 $licenseincludepatharrayref, 0);

Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/worker.pm
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/worker.pm?rev=1310178&r1=1310177&r2=1310178&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/worker.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/worker.pm Fri Apr  6 
06:06:17 2012
@@ -3126,10 +3126,10 @@ sub put_license_into_setup
 {
        my ($installdir, $includepatharrayref) = @_;    
 
-       # find and read english license file
+       # find and read the license file
        my $licenselanguage = "en-US";                                  # 
always english !
-       # my $licensefilename = "LICENSE_" . $licenselanguage;
-       my $licensefilename = "license_" . $licenselanguage . ".txt";
+       my $licensefilename = "LICENSE";
+#      my $licensefilename = "LICENSE" . ".txt";
        my $licenseincludepatharrayref = 
get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
 
        my $licenseref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename,
 $licenseincludepatharrayref, 0);