From b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 Mon Sep 17 00:00:00 2001 From: Tamas Bunth Date: Mon, 8 Oct 2018 11:04:48 +0200 Subject: Revert removal of mysql jdbc connector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And also make some minor fixes so it cooperates with the new mysqlc library. Change-Id: I866add99a699150c6550ee7f7ff2ee947e07117c Reviewed-on: https://gerrit.libreoffice.org/61648 Tested-by: Jenkins Reviewed-by: Tamás Bunth --- postprocess/CustomTarget_registry.mk | 5 +++-- postprocess/Rdb_services.mk | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 4968b6e3eaf5..d1583f2f81f5 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -331,8 +331,9 @@ 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 -postprocess_DRIVERS += hsqldb jdbc + $(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 endif ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) postprocess_FILES_main += \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 34a3dab0c6d3..fbd2a3008c1f 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -261,6 +261,7 @@ $(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/manager/sdbc2 \ connectivity/source/drivers/writer/writer \ -- cgit