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

scp2: move ct2n to AutoInstall

Browse Source 
Change-Id: Ib4501298c78e591f24c2ad73cbc8aec0c4fc0347
Reviewed-on: https://gerrit.libreoffice.org/13020
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2014-11-21 15:03:13 +01:00
committed by Michael Stahl
parent 460debad79
commit 715aafa6d9
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Repository.mk
View File

@@ -771,6 +771,12 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
)) ))
endif endif
ifeq (CT2N,$(filter CT2N,$(BUILD_TYPE)))
$(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\
ct2n \
))
endif
$(eval $(call gb_Helper_register_jars,OXT, \ $(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \ EvolutionarySolver \
active_java \ active_java \

1
scp2/AutoInstall.mk
View File

@@ -19,6 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))

13
scp2/source/extensions/file_extensions.scp
View File

@@ -48,19 +48,6 @@ End
#endif #endif
/* ** ConvertTextToNumber ** */
#ifdef WITH_EXTENSION_CT2N
File gid_File_Oxt_CT2N
TXT_FILE_BODY;
Styles = (PACKED, FILELIST);
Dir = FILELIST_DIR;
Name = "ct2n.filelist";
End
#endif
/* ** Hungarian Cross-reference Toolbar** */ /* ** Hungarian Cross-reference Toolbar** */
#ifdef WITH_EXTENSION_HUNART #ifdef WITH_EXTENSION_HUNART

6
scp2/source/extensions/module_extensions.scp
View File

@@ -95,12 +95,14 @@ End
/* ** ConvertTextToNumber ** */ /* ** ConvertTextToNumber ** */
#ifdef WITH_EXTENSION_CT2N #ifdef WITH_EXTENSION_CT2N
#include "AutoInstall/extensions_ct2n"
Module gid_Module_Optional_Extensions_CT2N Module gid_Module_Optional_Extensions_CT2N
PackageInfo = "packinfo_extensions.txt"; PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N); MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
ParentID = gid_Module_Optional_Extensions; ParentID = gid_Module_Optional_Extensions;
Files = ( Files = (auto_extensions_ct2n_ALL);
gid_File_Oxt_CT2N );
Minimal = NO; Minimal = NO;
Default = YES; Default = YES;
Styles = ( ); Styles = ( );