[Libreoffice-commits] .: scp2/source solenv/bin
Michael Meeks
mmeeks at kemper.freedesktop.org
Wed Dec 8 13:06:33 PST 2010
scp2/source/sdkoo/sdkoo.scp | 14 ++------------
solenv/bin/modules/installer/globals.pm | 2 +-
solenv/bin/modules/installer/javainstaller.pm | 2 +-
3 files changed, 4 insertions(+), 14 deletions(-)
New commits:
commit 91e973f513d51de3610561de4c8cfada2aaa0704
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Dec 8 21:04:27 2010 +0000
cleanup hard-coded license mentions in sdk and installer
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 2c7aa6e..f991f06 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -93,16 +93,6 @@ Directory gid_Dir_Basis_Sdk
#endif
End
-
-#if defined MACOSX
-ScpAction scp_Copy_License_Txt_Sdk
- README_ALL_LANG(Copy, LICENSE);
- README_ALL_LANG(Name, LICENSE);
- Styles = (SCPZIP_REPLACE);
- Subdir = "LICENSEs";
-End
-#endif
-
Directory gid_Dir_Share_Sdk
ParentID = gid_Dir_Basis_Sdk;
DosName = "share";
@@ -125,10 +115,10 @@ File gid_File_Txt_License
TXT_FILE_BODY;
Dir = gid_Dir_Share_Readme_Sdk;
#ifdef UNX
- Name = "LICENSE_en-US";
+ Name = "LICENSE";
#endif
#ifdef WNT
- Name = "license_en-US.txt";
+ Name = "license.txt";
#endif
Styles = (PACKED, SCPZIP_REPLACE);
End
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 02b71bc..7b2400d 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -190,7 +190,7 @@ BEGIN
%alllangmodules = ();
$englishlicenseset = 0;
$englishlicense = "";
- $englishsolarislicensename = "LICENSE_en-US";
+ $englishsolarislicensename = "LICENSE";
$solarisdontcompress = 0;
$patharray = "";
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index 7041897..25a75b1 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -273,7 +273,7 @@ sub get_licensefilesource
{
my ($language, $includepatharrayref) = @_;
- my $licensefilename = "LICENSE_" . $language;
+ my $licensefilename = "LICENSE"; # . '_' . $language;
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $includepatharrayref, 0);
if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "get_licensefilesource"); }
More information about the Libreoffice-commits
mailing list