Hi, Please review the attached patch that provide updated support for Ligthproof extension integration for 3.3.x series.
Thank you in advance! Best regards, KAMI
From 8c7538f9d61b097ac779f28f36c8f408bce9b6a8 Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami...@gmail.com>
Date: Mon, 20 Dec 2010 19:28:42 +0100
Subject: [PATCH 1/3] Update LightProof extensions' packing mechanism
* Install extracted extension files to separated and language dependent
directory. This is the new way to include extensions to installation
set.
* Update for Sun Template Pack packing
---
scp2/source/extensions/directory_extensions.scp | 18 +++++++++++++++---
scp2/source/extensions/file_extensions.scp | 6 +++---
scp2/source/extensions/module_extensions.scp | 1 +
.../extensions/module_extensions_lightproof.scp | 3 +--
.../extensions/module_extensions_sun_templates.scp | 3 +--
.../module_langpack_extensions_lightproof.sct | 1 +
.../module_langpack_extensions_templates.sct | 1 +
7 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 124be59..4338bd3 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -96,6 +96,17 @@ End
/* ** Lightproof ** */
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Directory gid_Brand_Dir_Share_Extensions_LightProof
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName (en-US) = "lightproof-en-US-0.1";
+ DosName (hu) = "lightproof-hu-1.2";
+ DosName = "lightproof";
+End
+
+#endif
+
/* ** Numbertext ** */
#ifdef WITH_EXTENSION_NUMBERTEXT
@@ -245,12 +256,13 @@ End
Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
ParentID = gid_Brand_Dir_Share_Extensions;
- DosName (en-US)= "Sun_ODF_Template_Pack_en-US";
+ DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
DosName (de) = "Sun_ODF_Template_Pack_de";
- DosName (it) = "Sun_ODF_Template_Pack_it";
- DosName (fr) = "Sun_ODF_Template_Pack_fr";
DosName (es) = "Sun_ODF_Template_Pack_es";
+ DosName (fr) = "Sun_ODF_Template_Pack_fr";
DosName (hu) = "Sun_ODF_Template_Pack_hu";
+ DosName (it) = "Sun_ODF_Template_Pack_it";
+ DosName = "Sun_ODF_Template_Pack";
End
#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 7b5d984..60bba7f 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -111,9 +111,9 @@ End
File gid_File_Oxt_LightProof
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Install;
- Name (hu) = "lightproof-hu-1.2.oxt";
+ Dir = gid_Brand_Dir_Share_Extensions_LightProof;
Name (en-US) = "lightproof-en-US-0.1.oxt";
+ Name (hu) = "lightproof-hu-1.2.oxt";
End
#endif
@@ -301,7 +301,7 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
Name (it) = "Sun_ODF_Template_Pack_it.oxt";
Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
Name (es) = "Sun_ODF_Template_Pack_es.oxt";
- Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
+ Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
End
#endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 7d9683b..b1c771c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -133,6 +133,7 @@ Module gid_Module_Optional_Extensions_LightProof
Default = YES;
Styles = ( );
End
+
#endif
/* ** Numbertext ** */
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
index 7caa601..479437b 100644
--- a/scp2/source/extensions/module_extensions_lightproof.scp
+++ b/scp2/source/extensions/module_extensions_lightproof.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_LightProof_Template
Name = "gid_Module_Optional_Extensions_LightProof_Template";
Description = "gid_Module_Optional_Extensions_LightProof_Template";
Styles = (TEMPLATEMODULE);
- Files = (
- gid_File_Oxt_LightProof );
+ Files = ( gid_File_Oxt_LightProof );
Minimal = NO;
Default = YES;
End
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
index bd6fe0a..6e5897e 100644
--- a/scp2/source/extensions/module_extensions_sun_templates.scp
+++ b/scp2/source/extensions/module_extensions_sun_templates.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
Styles = (TEMPLATEMODULE);
- Files = (
- gid_File_Optional_Extensions_Sun_Template_Pack );
+ Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
Minimal = NO;
Default = YES;
End
diff --git a/scp2/source/templates/module_langpack_extensions_lightproof.sct b/scp2/source/templates/module_langpack_extensions_lightproof.sct
index 1cadbde..ab04e6f 100644
--- a/scp2/source/templates/module_langpack_extensions_lightproof.sct
+++ b/scp2/source/templates/module_langpack_extensions_lightproof.sct
@@ -53,3 +53,4 @@ Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
PackageInfo = "packinfo_office_lang.txt";
Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
End
+
diff --git a/scp2/source/templates/module_langpack_extensions_templates.sct b/scp2/source/templates/module_langpack_extensions_templates.sct
index f5099ab..8e94a5a 100644
--- a/scp2/source/templates/module_langpack_extensions_templates.sct
+++ b/scp2/source/templates/module_langpack_extensions_templates.sct
@@ -53,3 +53,4 @@ Module gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>
PackageInfo = "packinfo_office_lang.txt";
Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
End
+
--
1.7.1
signature.asc
Description: OpenPGP digital signature
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
