[Libreoffice-commits] core.git: Repository.mk scp2/AutoInstall.mk scp2/InstallModule_extensions.mk scp2/source

[David Ostrovsky]

 Repository.mk                                |    6 ++++++
 scp2/AutoInstall.mk                          |    1 +
 scp2/InstallModule_extensions.mk             |    1 +
 scp2/source/extensions/file_extensions.scp   |   13 -------------
 scp2/source/extensions/module_extensions.scp |    6 ++++--
 5 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 5f77059ff156ecbd69967f278d3e8f814c15958e
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Nov 22 21:46:23 2014 +0100

    scp2: move numbertext to AutoInstall
    
    Change-Id: Idf9ea17b485ab07323a895e7e3f1eca1e198747c
    Reviewed-on: https://gerrit.libreoffice.org/13047
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/Repository.mk b/Repository.mk
index e5eceac..d84dc6d 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 62f043c..30b0baf 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 113779f..a6022a7 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 fec3835..637f566 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 5dfb7c1..a66d240 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 = ( );