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

[Michael Stahl]

 Repository.mk                 |    5 ++++-
 RepositoryExternal.mk         |    4 ++++
 scp2/AutoInstall.mk           |    1 +
 scp2/InstallModule_base.mk    |    1 +
 scp2/source/base/firebird.scp |   13 +++----------
 5 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit e014213ae42da5e5464724bc79956e684f7f20cd
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 9 14:49:38 2017 +0100

    scp2: move firebird_sdbc library to firebirdsdbc module
    
    Change-Id: Ie57ae3452947a8454eca5d83f2e80d168ef2fa6d

diff --git a/Repository.mk b/Repository.mk
index 560716d..f891da0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -334,7 +334,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 		flat \
 		file) \
 	filterconfig \
-	$(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
 	fps_office \
 	for \
 	forui \
@@ -457,6 +456,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
 		postgresql-sdbc-impl) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,firebirdsdbc, \
+	$(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
+))
+
 ifneq ($(ENABLE_PDFIMPORT),)
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
 	pdfimport \
commit 2c78d4965a8ddd77b926edc0e0aa4a19577e2453
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 9 14:45:11 2017 +0100

    tdf#90753 scp2: move firebirdsdbc packages to AutoInstall
    
    Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f4732df..02392ae 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2925,6 +2925,10 @@ endef
 
 else # !SYSTEM_FIREBIRD
 
+$(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\
+	firebird \
+))
+
 #$(call gb_LinkTarget__use_libatomic_ops,$(1))
 #$(call gb_LinkTarget__use_libtommath,$(1))
 
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 43c53ab..409ceb9 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -22,6 +22,7 @@ $(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,firebirdsdbc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 2efba18..709d149 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
 	base \
 	base_brand \
+	firebirdsdbc \
 	postgresqlsdbc \
 ))
 
diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp
index dd7288f..61cfff9 100644
--- a/scp2/source/base/firebird.scp
+++ b/scp2/source/base/firebird.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/firebirdsdbc"
+
 #if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
 
 Module gid_Module_Optional_Firebird
@@ -25,17 +27,8 @@ Module gid_Module_Optional_Firebird
     Description = "Firebird embedded database";
     PackageInfo = "packinfo_office.txt";
     ParentID = gid_Module_Root_Brand;
-    Files = (
-        File gid_File_Firebird
-    );
+    Files = (auto_firebirdsdbc_ALL);
     Styles = (HIDDEN_ROOT);
 End
 
-File gid_File_Firebird
-    TXT_FILE_BODY;
-    Styles = (FILELIST, PACKED);
-    Dir = FILELIST_DIR;
-    Name = "firebird.filelist";
-End
-
 #endif