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

[David Ostrovsky]

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

New commits:
commit 715aafa6d9dbc23be738597b4fa15af102f1f98f
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Nov 21 15:03:13 2014 +0100

    scp2: move ct2n to AutoInstall
    
    Change-Id: Ib4501298c78e591f24c2ad73cbc8aec0c4fc0347
    Reviewed-on: https://gerrit.libreoffice.org/13020
    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 e5fa7eb..0e0dffc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -771,6 +771,12 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
 ))
 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, \
 	EvolutionarySolver \
 	active_java \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 9ab563b..62f043c 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -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,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_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 507128f..fec3835 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -48,19 +48,6 @@ End
 
 #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** */
 
 #ifdef WITH_EXTENSION_HUNART
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index ce72b5f..5dfb7c1 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -95,12 +95,14 @@ End
 /* ** ConvertTextToNumber ** */
 
 #ifdef WITH_EXTENSION_CT2N
+
+#include "AutoInstall/extensions_ct2n"
+
 Module gid_Module_Optional_Extensions_CT2N
     PackageInfo = "packinfo_extensions.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
     ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_CT2N );
+    Files = (auto_extensions_ct2n_ALL);
     Minimal = NO;
     Default = YES;
     Styles = ( );