mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp2: move gallery packages to AutoInstall

Browse Source 
Change-Id: I56a89b8785d7ac9f959ed43be26302540332e7ee
This commit is contained in:
Michael Stahl
2015-02-28 20:46:37 +01:00
parent 081a3ea796
commit 855d4c5c12
5 changed files with 31 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Repository.mk
View File

@@ -765,6 +765,29 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
)) ))
endif 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))) ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE)))
$(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\ $(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\
ct2n \ ct2n \

1
scp2/AutoInstall.mk
View File

@@ -9,6 +9,7 @@
$(eval $(call gb_AutoInstall_AutoInstall)) $(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,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64")) $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))

8
scp2/InstallModule_accessories.mk
View File

@@ -9,6 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/accessories)) $(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,\ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
scp2/source/accessories/module_accessories \ scp2/source/accessories/module_accessories \
)) ))
@@ -24,10 +28,6 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
endif endif
ifneq ($(WITH_EXTRA_GALLERY),) 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,\ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/accessories,\
scp2/source/accessories/module_gallery_accessories \ scp2/source/accessories/module_gallery_accessories \
)) ))

136
scp2/source/accessories/file_gallery_accessories.scp
View File

@@ -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

21
scp2/source/accessories/module_gallery_accessories.scp
View File

@@ -8,30 +8,15 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/accessories_gallery"
#ifdef WITH_EXTRA_GALLERY #ifdef WITH_EXTRA_GALLERY
Module gid_Module_Optional_Accessories_Gallery Module gid_Module_Optional_Accessories_Gallery
PackageInfo = "packinfo_accessories.txt"; PackageInfo = "packinfo_accessories.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY); MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
ParentID = gid_Module_Optional_Accessories; ParentID = gid_Module_Optional_Accessories;
Files = ( Files = (auto_accessories_gallery_ALL);
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 );
Default = YES; Default = YES;
Styles = ( ); Styles = ( );
End End