diff options
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_extensions.mk | 1 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 13 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 6 |
5 files changed, 12 insertions, 15 deletions
diff --git a/Repository.mk b/Repository.mk index e5eceace3d1a..d84dc6de020c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -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 \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 62f043cdcc6d..30b0baff89b6 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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)) diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk index 113779fcf780..a6022a7c5b33 100644 --- a/scp2/InstallModule_extensions.mk +++ b/scp2/InstallModule_extensions.mk @@ -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 \ diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index fec3835a2dd3..637f566dc158 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -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 diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 5dfb7c122c0c..a66d240efb40 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -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 = ( ); |