[Libreoffice-commits] core.git: dbaccess/Module_dbaccess.mk extensions/Module_extensions.mk postprocess/Rdb_services.mk Repository.mk RepositoryModule_host.mk solenv/bin
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 31 14:07:41 UTC 2019
Repository.mk | 8 ++++----
RepositoryModule_host.mk | 2 +-
dbaccess/Module_dbaccess.mk | 15 +++++++++------
extensions/Module_extensions.mk | 5 ++++-
postprocess/Rdb_services.mk | 7 +++++--
solenv/bin/native-code.py | 5 ++++-
6 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit 6eb5cffa1c4ee15bf96fe97769efac65ba785ef9
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Dec 31 13:35:11 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Dec 31 15:07:09 2019 +0100
tdf#129375: Avoid crash when inserting bibliography entry on iOS
I don't really know how the bibliography functionality works and how
it is connected to database stuff. Until now Library_bib for
instance was excluded for iOS because it was seen to be part of the
"DBCONNECTIVITY" feature. Change that now. Also, build the dba and
dbahsql libraries also in the non-DBCONNECTIVITY case. This at least
avoids the crash and avoids new warnings about missing constructors or
factories.
Change-Id: I8a8c62a895fcd43e7fa725a4707ac5ad428a64b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86043
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86045
Tested-by: Jenkins
diff --git a/Repository.mk b/Repository.mk
index c66b10a856f9..d06f4d0dbc48 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -340,11 +340,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
configmgr \
ctl \
cui \
+ dba \
+ dbahsql \
$(call gb_Helper_optional,DBCONNECTIVITY, \
- dba \
dbase \
- dbaxml \
- dbahsql) \
+ dbaxml) \
dbtools \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
@@ -1100,7 +1100,7 @@ $(eval $(call gb_Helper_register_mos,\
chart \
cnr \
cui \
- $(call gb_Helper_optional,DBCONNECTIVITY,dba) \
+ dba \
dkt \
editeng \
flt \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 062679170b42..8c3b8c02e198 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cppuhelper \
cpputools \
cui \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbaccess) \
+ dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
dtrans \
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 99073bb80a70..50d601e853ae 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -9,15 +9,22 @@
$(eval $(call gb_Module_Module,dbaccess))
+$(eval $(call gb_Module_add_targets,dbaccess,\
+ Library_dba \
+ Library_dbahsql \
+))
+
+$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
+ AllLangMoTarget_dba \
+))
+
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,dbaccess,\
$(if $(filter WNT,$(OS)),Executable_odbcconfig) \
- Library_dba \
Library_dbaxml \
Library_dbu \
Library_sdbt \
- Library_dbahsql \
UIConfig_dbaccess \
UIConfig_dbapp \
UIConfig_dbbrowser \
@@ -27,10 +34,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
UIConfig_dbtdata \
))
-$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
- AllLangMoTarget_dba \
-))
-
ifneq ($(OS),iOS)
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 43dd929ac121..9612620e3a72 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -33,9 +33,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
))
endif
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\
Library_bib \
+))
+
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Module_add_targets,extensions,\
Library_dbp \
Library_pcr \
UIConfig_sbibliography \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f8c5047de79f..c5f5fe31a63b 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -229,10 +229,14 @@ $(eval $(call gb_Rdb_add_components,services,\
) \
))
+$(eval $(call gb_Rdb_add_components,services,\
+ extensions/source/bibliography/bib \
+ dbaccess/util/dba \
+))
+
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Rdb_add_components,services,\
- extensions/source/bibliography/bib \
extensions/source/dbpilots/dbp \
extensions/source/propctrlr/pcr \
connectivity/source/cpool/dbpool2 \
@@ -263,7 +267,6 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/manager/sdbc2 \
connectivity/source/drivers/writer/writer \
dbaccess/source/filter/xml/dbaxml \
- dbaccess/util/dba \
dbaccess/util/dbu \
dbaccess/util/sdbt \
forms/util/frm \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 204b0081212c..6cf959234563 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -66,6 +66,8 @@ core_factory_list = [
("libcuilo.a", "cui_component_getFactory"),
("libproxyfaclo.a", "proxyfac_component_getFactory"),
("libguesslanglo.a", "guesslang_component_getFactory"),
+ ("libbiblo.a", "bib_component_getFactory"),
+ ("libdbalo.a", "dba_component_getFactory"),
]
core_constructor_list = [
@@ -133,7 +135,7 @@ core_constructor_list = [
"com_sun_star_comp_SequenceOutputStreamService",
"com_sun_star_comp_util_OfficeInstallationDirectories",
# dbaccess/util/dba.component
- ("com_sun_star_comp_dba_ORowSet_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
+ "com_sun_star_comp_dba_ORowSet_get_implementation",
# forms/util/frm.component
("com_sun_star_comp_forms_FormOperations_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
("com_sun_star_comp_forms_ODatabaseForm_get_implementation", "#if HAVE_FEATURE_DBCONNECTIVITY"),
@@ -271,6 +273,7 @@ core_constructor_list = [
"stardiv_Toolkit_VCLXToolkit_get_implementation",
# uui/util/uui.component
"com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
+ "com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
# xmloff/util/xo.component
"XMLMetaExportComponent_get_implementation",
"XMLMetaImportComponent_get_implementation",
More information about the Libreoffice-commits
mailing list