diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-09 14:45:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-09 16:43:29 +0100 |
| commit | 2c78d4965a8ddd77b926edc0e0aa4a19577e2453 (patch) | |
| tree | c9b02c3511b6c4d08b7cc757455b121771175ff1 | |
| parent | ce38f88151817648ae2fdb9788f5a40d12b1057a (diff) | |
tdf#90753 scp2: move firebirdsdbc packages to AutoInstall
Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_base.mk | 1 | ||||
| -rw-r--r-- | scp2/source/base/firebird.scp | 13 |
4 files changed, 9 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f4732dfbc1f8..02392ae9af8c 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 43c53ab7dadf..409ceb9ed21f 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 2efba1843919..709d1493e0d8 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 dd7288f38ea1..61cfff9cc496 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 |