diff options
author | Kalman Szalai - KAMI <kami911@gmail.com> | 2010-12-20 19:28:42 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-01-04 06:59:09 +0100 |
commit | e2f3768d62bad56af2a40bd0a744eb1eccc244a0 (patch) | |
tree | 831055abd749ef3879720f1c27ae46ff57de40e9 /scp2 | |
parent | 5f27114fa9a14a8206310df1e8869da9d8613a80 (diff) |
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
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scp2')
5 files changed, 20 insertions, 9 deletions
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 124be591a915..2d12668d86e2 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 7b5d984b08c1..55d1c7acf531 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 diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 7d9683b6f7f2..b1c771cb8bca 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 7caa60178b76..58aa59ad17c4 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 bd6fe0a59d77..6e5897ee58f4 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 |