[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - scp2/source solenv/bin solenv/inc
Fridrich Strba
fridrich at kemper.freedesktop.org
Mon Dec 13 11:16:39 PST 2010
scp2/source/ooo/common_brand.scp | 44 ++++++++++++--------------
scp2/source/ooo/common_brand_readme.scp | 40 +----------------------
scp2/source/ooo/directory_ooo.scp | 5 ++
scp2/source/ooo/file_extra_ooo.scp | 13 +++----
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/module_lang_template.scp | 1
scp2/source/ooo/scpaction_ooo.scp | 31 ------------------
scp2/source/sdkoo/sdkoo.scp | 14 +-------
solenv/bin/modules/installer/globals.pm | 2 -
solenv/bin/modules/installer/javainstaller.pm | 2 -
solenv/inc/extension_post.mk | 4 +-
solenv/inc/extension_pre.mk | 8 ++--
12 files changed, 45 insertions(+), 120 deletions(-)
New commits:
commit dab239aa4692c8f0c65a943fbc1e69c9695085f5
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 7d85f73..e26feac 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 57ed700..15e0f26 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -274,7 +274,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"); }
commit c3dfa58366a0eb0f89693cccdd8b459fafcc9804
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Dec 8 20:09:08 2010 +0000
fixup extensions' LICENSE file re-use rules
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index f221ff7..868ef4b 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -149,9 +149,9 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
# may not fit...
.IF "$(CUSTOM_LICENSE)"==""
.IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
.ELSE # "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
.ENDIF # "$(GUI)" == "WNT"
.ELSE # "$(CUSTOM_LICENSE)" == ""
PACKLICDEPS=$(CUSTOM_LICENSE)
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index abef2e7..7fd8f5d 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -39,11 +39,11 @@ COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
MANIFEST_SRC*:=manifest.xml
.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt)
-COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt
+PACKLICS*:=$(EXTENSIONDIR)/registration/license.txt
+COMPONENT_LIC_TEMPL*:=registration/license.txt
.ELSE
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i)
-COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
+PACKLICS*:=$(EXTENSIONDIR)/registration/LICENSE
+COMPONENT_LIC_TEMPL*:=registration/LICENSE
.ENDIF
#TODO: check ZIP9TARGET for previous use!
commit 1b1f4c4313fc1adf684a7cf1e83bff68cd42504b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Dec 8 18:57:42 2010 +0000
cleanup unfortunate license duplication
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5fe49e6..34b75e3 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -101,7 +101,10 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
- gid_Brand_File_Txt_Package);
+ gid_Brand_File_Txt_Package,
+ gid_License_Txt,
+ git_License_Odt,
+ gid_Credits_Odt);
Unixlinks = (gid_Brand_Unixlink_BasisLink,
gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
@@ -118,13 +121,10 @@ Module gid_Module_Langpack_Brand_Template
InstallOrder = "1050";
Dirs = (gid_Brand_Dir_Help,
gid_Brand_Dir_Help_Isolanguage,
- gid_Brand_Dir_License,
gid_Brand_Dir_Program,
gid_Brand_Dir_Program_Shell,
gid_Brand_Dir_Program_Resource,
- gid_Brand_Dir_Readme,
- gid_Brand_Dir_Share,
- gid_Brand_Dir_Share_Readme);
+ gid_Brand_Dir_Readme);
Files = (gid_Brand_File_Res_Iso,
gid_Brand_File_Res_Ooo,
gid_Brand_File_Res_Oirm,
@@ -132,13 +132,9 @@ Module gid_Module_Langpack_Brand_Template
gid_Brand_File_Help_C05_Scalc_Zip,
gid_Brand_File_Help_C05_Sdraw_Zip,
gid_Brand_File_Help_C05_Swriter_Zip,
- gid_Brand_File_License_License,
- gid_Brand_File_License_License_Small,
gid_Brand_File_Readme_Readme,
gid_Brand_File_Share_Registry_Cjk_Xcd,
gid_Brand_File_Share_Registry_Korea_Xcd,
- gid_Brand_File_Txt_License,
- gid_Brand_File_Txt_License_Small,
gid_Brand_File_Txt_Readme);
End
@@ -173,15 +169,6 @@ Directory gid_Brand_Dir_Readme
DosName = "readmes";
End
-Directory gid_Brand_Dir_License
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
- ParentID = gid_Dir_Brand_Root;
-#endif
- DosName = "licenses";
-End
-
Directory gid_Brand_Dir_Help
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
@@ -210,11 +197,6 @@ Directory gid_Brand_Dir_Share_Config
DosName = "config";
End
-Directory gid_Brand_Dir_Share_Readme
- ParentID = gid_Brand_Dir_Share;
- DosName = "readme";
-End
-
Directory gid_Brand_Dir_Share_Extension
ParentID = gid_Brand_Dir_Share;
DosName = "extension";
@@ -1503,6 +1485,22 @@ File gid_Brand_File_Bin_Python
End
#endif
+File gid_License_Txt
+ TXT_FILE_BODY;
+#if defined MACOSX
+ Dir = gid_Brand_Dir_BasisLink;
+#else
+ Dir = gid_Dir_Brand_Root;
+#endif
+ #ifdef UNX
+ Name = "LICENSE";
+ #endif
+ #ifdef WNT
+ Name = "license.txt";
+ #endif
+ Styles = (PACKED);
+End
+
File gid_License_Odt
BIN_FILE_BODY;
#if defined MACOSX
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index bd77922..77aabc8 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -29,45 +29,9 @@
// Files
-File gid_Brand_File_Txt_License
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Readme;
- #ifdef UNX
- README_ALL_LANG(Name, LICENSE);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, license, txt);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_License;
- #ifdef UNX
- README_ALL_LANG(Name, LICENSE);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, license, txt);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Readme;
- #ifdef UNX
- README_ALL_LANG(Name, README);
- #endif
- #ifdef WNT
- README_TXT_ALL_LANG(Name, readme, txt);
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
File gid_Brand_File_Readme_Readme
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Readme;
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Readme;
#ifdef UNX
README_ALL_LANG(Name, README);
#endif
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index de546e8..85c1030 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,22 +27,6 @@
#include "macros.inc"
-ScpAction scp_Copy_License_Txt
- #ifdef UNX
- README_ALL_LANG(Copy, LICENSE);
- README_ALL_LANG(Name, LICENSE);
- #else
- README_TXT_ALL_LANG(Copy, license, txt);
- README_TXT_ALL_LANG(Name, license, txt);
- #endif
- Styles = (SCPZIP_REPLACE);
- #ifndef MACOSX
- Subdir = "licenses";
- #else
- Subdir = "LICENSEs";
- #endif
-End
-
#ifdef MACOSX
ScpAction scp_Copy_Thirdpartylicense_Readme_Html
Copy = "THIRDPARTYLICENSEREADME.html";
@@ -116,21 +100,6 @@ ScpAction scp_Copy_Xpd_Gif_Setup
Subdir = "installdata/images";
End
-// Setup license file
-ScpAction scp_Copy_Xpd_Html_License
- README_TXT_ALL_LANG(Copy, LICENSE, html);
- README_TXT_ALL_LANG(Name, LICENSE, html);
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Html_License_En_Us
- Copy = "LICENSE_en-US.html";
- Name = "LICENSE.html";
- Styles = (XPD_ONLY);
- Subdir = "installdata/html";
-End
-
// Setup help files
ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
commit e74ee2db410fce844c0591887ceff9b9ae214349
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Dec 8 15:27:32 2010 +0000
make impress templates language neutral to save space
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 9668742..ea53086 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -975,6 +975,11 @@ Directory gid_Dir_Share_Template_Wizard
DosName = "wizard";
End
+Directory gid_Dir_Share_Template_Layout
+ ParentID = gid_Dir_Template;
+ DosName = "layout";
+End
+
Directory gid_Dir_Share_Template_Wizard_Bitmap
ParentID = gid_Dir_Share_Template_Wizard;
DosName = "bitmap";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index ee8c46f..49f3fb7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -350,13 +350,6 @@ File gid_File_Extra_Symbols
Name = "symbols.zip";
End
-File gid_File_Extra_Tpllayoutimpr_Lang
- Dir = gid_Dir_Template_Layout;
- TXT_FILE_BODY;
- Styles = (ARCHIVE, DONT_OVERWRITE);
- EXTRA_ALL_LANG(tpllayoutimpr,zip);
-End
-
File gid_File_Extra_Tplpresntimpr_Lang
Dir = gid_Dir_Template_Presnt;
TXT_FILE_BODY;
@@ -364,6 +357,12 @@ File gid_File_Extra_Tplpresntimpr_Lang
EXTRA_ALL_LANG(tplpresntimpr,zip);
End
+File gid_File_Extra_Tpllayoutimpr
+ Dir = gid_Dir_Share_Template_Layout;
+ ARCHIVE_TXT_FILE_BODY;
+ Name = "tpllayoutimpr.zip";
+End
+
File gid_File_Extra_Tplwizbitmap
Dir = gid_Dir_Share_Template_Wizard_Bitmap;
ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 9d281cd..b83934a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -454,6 +454,7 @@ Module gid_Module_Root_Files_6
gid_File_Extra_Gallwwwgraf,
gid_File_Extra_Migration,
gid_File_Extra_Migration_Lang_Multi,
+ gid_File_Extra_Tpllayoutimpr,
gid_File_Extra_Tplwizbitmap,
gid_File_Extra_Tplwizletter,
gid_File_Extra_Tplwizletter_en_US,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 4e4b55d..e95ca32 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -32,7 +32,6 @@ Module gid_Module_Langpack_Basis_Template
Styles = (TEMPLATEMODULE);
Files = (gid_File_Extra_Autotextshare_Lang,
gid_File_Extra_Palettes_Lang,
- gid_File_Extra_Tpllayoutimpr_Lang,
gid_File_Extra_Tplpresntimpr_Lang,
gid_File_Extra_Tplwizagenda_Lang,
gid_File_Extra_Tplwizdesktop_Lang,
More information about the Libreoffice-commits
mailing list