diff options
| -rw-r--r-- | Repository.mk | 23 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_accessories.mk | 8 | ||||
| -rw-r--r-- | scp2/source/accessories/file_gallery_accessories.scp | 136 | ||||
| -rw-r--r-- | scp2/source/accessories/module_gallery_accessories.scp | 21 |
5 files changed, 31 insertions, 158 deletions
diff --git a/Repository.mk b/Repository.mk index 095dfba53908..48a623a78f49 100644 --- a/Repository.mk +++ b/Repository.mk @@ -765,6 +765,29 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \ )) endif +ifneq ($(WITH_EXTRA_GALLERY),) +$(eval $(call gb_Helper_register_packages_for_install,accessories_gallery,\ + accessories_accessoriesgallery \ + accessories_accessoriesgallerydrawspeople \ + accessories_accessoriesgalleryphotosplants \ + accessories_accessoriesgalleryphotoscelebration \ + accessories_accessoriesgalleryphotosfauna \ + accessories_accessoriesgalleryphotosflowers \ + accessories_accessoriesgalleryphotosfoodsanddrinks \ + accessories_accessoriesgalleryphotoshumans \ + accessories_accessoriesgalleryphotoslandscapes \ + accessories_accessoriesgalleryphotosbuildings \ + accessories_accessoriesgalleryphotoscities \ + accessories_accessoriesgalleryphotosobjects \ + accessories_accessoriesgalleryphotosspace \ + accessories_accessoriesgalleryphotosstatues \ + accessories_accessoriesgalleryphotostravel \ + accessories_accessoriesgalleryelementsbullets2 \ + accessories_accessoriesgallerynonfree \ +)) + +endif + ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE))) $(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\ ct2n \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 4983fc7bb406..c4f4fd0555b8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -9,6 +9,7 @@ $(eval $(call gb_AutoInstall_AutoInstall)) +$(eval $(call gb_AutoInstall_add_module,accessories_gallery,)) $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64")) diff --git a/scp2/InstallModule_accessories.mk b/scp2/InstallModule_accessories.mk index fb639faae2e8..3aca746d1801 100644 --- a/scp2/InstallModule_accessories.mk +++ b/scp2/InstallModule_accessories.mk @@ -9,6 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/accessories)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/accessories,\ + accessories_gallery \ +)) + $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ scp2/source/accessories/module_accessories \ )) @@ -24,10 +28,6 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ endif ifneq ($(WITH_EXTRA_GALLERY),) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/accessories,\ - scp2/source/accessories/file_gallery_accessories \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\ scp2/source/accessories/module_gallery_accessories \ )) diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp deleted file mode 100644 index 953fa538fa43..000000000000 --- a/scp2/source/accessories/file_gallery_accessories.scp +++ /dev/null @@ -1,136 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "macros.inc" - -/* *** Accessories Extras *** */ - -/* ** Gallery ** */ - -#ifdef WITH_EXTRA_GALLERY - -File gid_File_Extra_Gallery_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallery.filelist"; -End - -File gid_File_Extra_Gallery_Draws_People_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallerydrawspeople.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Plants_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosplants.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Celebration_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoscelebration.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Fauna_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosfauna.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Flowers_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosflowers.filelist"; -End - -File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosfoodsanddrinks.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Humans_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoshumans.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Landscapes_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoslandscapes.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Buildings_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosbuildings.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Objects_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosobjects.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Cities_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotoscities.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Space_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosspace.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Statues_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotosstatues.filelist"; -End - -File gid_File_Extra_Gallery_Photos_Travel_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryphotostravel.filelist"; -End - -File gid_File_Extra_Gallery_Elements_Bullets2_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgalleryelementsbullets2.filelist"; -End - -File gid_File_Extra_Gallery_NONFREE_Accessories - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "accessories_accessoriesgallerynonfree.filelist"; -End - -#endif diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp index 46dab54a7b8f..15af621668cc 100644 --- a/scp2/source/accessories/module_gallery_accessories.scp +++ b/scp2/source/accessories/module_gallery_accessories.scp @@ -8,30 +8,15 @@ #include "macros.inc" +#include "AutoInstall/accessories_gallery" + #ifdef WITH_EXTRA_GALLERY Module gid_Module_Optional_Accessories_Gallery PackageInfo = "packinfo_accessories.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY); ParentID = gid_Module_Optional_Accessories; - Files = ( - gid_File_Extra_Gallery_Accessories, - gid_File_Extra_Gallery_Draws_People_Accessories, - gid_File_Extra_Gallery_Photos_Plants_Accessories, - gid_File_Extra_Gallery_Photos_Celebration_Accessories, - gid_File_Extra_Gallery_Photos_Fauna_Accessories, - gid_File_Extra_Gallery_Photos_Flowers_Accessories, - gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories, - gid_File_Extra_Gallery_Photos_Humans_Accessories, - gid_File_Extra_Gallery_Photos_Landscapes_Accessories, - gid_File_Extra_Gallery_Photos_Objects_Accessories, - gid_File_Extra_Gallery_Photos_Buildings_Accessories, - gid_File_Extra_Gallery_Photos_Cities_Accessories, - gid_File_Extra_Gallery_Photos_Space_Accessories, - gid_File_Extra_Gallery_Photos_Statues_Accessories, - gid_File_Extra_Gallery_Photos_Travel_Accessories, - gid_File_Extra_Gallery_Elements_Bullets2_Accessories, - gid_File_Extra_Gallery_NONFREE_Accessories ); + Files = (auto_accessories_gallery_ALL); Default = YES; Styles = ( ); End |