ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

scp2: move numbertext to AutoInstall

Browse Source 
Change-Id: Idf9ea17b485ab07323a895e7e3f1eca1e198747c
Reviewed-on: https://gerrit.libreoffice.org/13047
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2014-12-10 21:11:48 +00:00
committed by Michael Stahl
parent 5eba123880
commit 5f77059ff1
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+6
View File
@@ -780,6 +780,12 @@ $(eval $(call gb_Helper_register_packages_for_install,extensions_ct2n,\
))
endif
ifeq (NUMBERTEXT,$(filter NUMBERTEXT,$(BUILD_TYPE)))
$(eval $(call gb_Helper_register_packages_for_install,extensions_numbertext,\
numbertext \
))
endif
$(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
scp2/AutoInstall.mk
+1
View File
@@ -21,6 +21,7 @@ $(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,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_numbertext,,,,))
$(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,graphicfilter,LIBO_LIB_FILE))
scp2/InstallModule_extensions.mk
+1
View File
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_ct2n))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_numbertext))
$(eval $(call gb_InstallModule_add_templates,scp2/extensions,\
scp2/source/templates/module_langpack_extensions_templates \
scp2/source/extensions/file_extensions.scp
-13
View File
@@ -35,19 +35,6 @@ End
#endif
/* ** Numbertext ** */
#ifdef WITH_EXTENSION_NUMBERTEXT
File gid_File_Oxt_NumberText
TXT_FILE_BODY;
Styles = (PACKED, FILELIST);
Dir = FILELIST_DIR;
Name = "numbertext.filelist";
End
#endif
/* ** Hungarian Cross-reference Toolbar** */
#ifdef WITH_EXTENSION_HUNART
scp2/source/extensions/module_extensions.scp
+4 -2
View File
@@ -50,12 +50,14 @@ End
/* ** Numbertext ** */
#ifdef WITH_EXTENSION_NUMBERTEXT
#include "AutoInstall/extensions_numbertext"
Module gid_Module_Optional_Extensions_NumberText
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
ParentID = gid_Module_Optional_Extensions;
Files = (
gid_File_Oxt_NumberText );
Files = (auto_extensions_numbertext_ALL);
Minimal = NO;
Default = YES;
Styles = ( );