Repository.mk | 2 +-
connectivity/Module_connectivity.mk | 4 ++--
postprocess/CustomTarget_registry.mk | 10 +++++-----
postprocess/Rdb_services.mk | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 1fb358bcd50d6729dde8071c857206ce7560f1a0
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
AuthorDate: Tue Sep 17 12:30:12 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Sep 19 13:32:10 2019 +0200
Build mysql_jdbc library even when building without java
Change-Id: Iecf49ab466a77f8342e69bf245a30e1529fe0078
Reviewed-on: https://gerrit.libreoffice.org/79056
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index 91b080963b6d..c8a4afba4a51 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -404,7 +404,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
- $(if $(ENABLE_JAVA),mysql_jdbc) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
$(call gb_Helper_optional,MARIADBC,$(call
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
numbertext \
odbc \
diff --git a/connectivity/Module_connectivity.mk
b/connectivity/Module_connectivity.mk
index 4d2596c4602e..b4f813739c0e 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_dbase \
Configuration_flat \
Configuration_odbc \
+ Configuration_mysql_jdbc \
Configuration_writer \
Library_calc \
Library_dbase \
@@ -28,6 +29,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_file \
Library_flat \
$(if $(filter ANDROID iOS,$(OS)),,Library_odbc) \
+ Library_mysql_jdbc \
Library_sdbc2 \
Library_writer \
))
@@ -40,8 +42,6 @@ ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_hsqldb \
Configuration_jdbc \
- Configuration_mysql_jdbc \
- Library_mysql_jdbc \
Jar_sdbc_hsqldb \
Library_hsqldb \
Library_jdbc \
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 43a401db5092..f8460eae30ba 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -277,8 +277,9 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_main += \
$(call
gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu
\
$(call
gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu
\
- $(call
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
-postprocess_DRIVERS += dbase flat odbc
+ $(call
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
\
+ $(call
gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu
+postprocess_DRIVERS += dbase flat odbc mysql_jdbc
ifeq (WNT,$(OS))
else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
@@ -331,9 +332,8 @@ endif
ifeq ($(ENABLE_JAVA),TRUE)
postprocess_FILES_main += \
$(call
gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu
\
- $(call
gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
\
- $(call
gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu
-postprocess_DRIVERS += hsqldb jdbc mysql_jdbc
+ $(call
gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
+postprocess_DRIVERS += hsqldb jdbc
endif
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
postprocess_FILES_main += \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 6e92e790339f..f53ed61c8eb1 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -263,8 +263,8 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_JAVA), \
connectivity/source/drivers/hsqldb/hsqldb \
connectivity/source/drivers/jdbc/jdbc \
- connectivity/source/drivers/mysql_jdbc/mysql_jdbc \
) \
+ connectivity/source/drivers/mysql_jdbc/mysql_jdbc \
connectivity/source/manager/sdbc2 \
connectivity/source/drivers/writer/writer \
dbaccess/source/ext/macromigration/dbmm \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
