postprocess/CustomTarget_registry.mk | 10 +++++-----
postprocess/Rdb_services.mk | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 82d4b092e127f2222a5deaf4f6606d5ebae882dc
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
AuthorDate: Fri Nov 23 17:49:54 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Nov 26 08:56:15 2018 +0100
Build mysql_jdbc library even when building..
.. without java
Change-Id: Id44ef2d94992423a12b32234822e8ed3f5a48299
Reviewed-on: https://gerrit.libreoffice.org/63889
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btom...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/64019
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index b5a9784bf5d7..91e05fa4592f 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -334,9 +334,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)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu
-postprocess_DRIVERS += hsqldb jdbc mysql
+ $(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 += \
@@ -425,8 +424,9 @@ postprocess_FILES_writer := \
ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_writer += \
- $(call
gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu
-postprocess_DRIVERS += writer
+ $(call
gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu
\
+ $(call
gb_XcuModuleTarget_get_target,connectivity/registry/mysql)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu
+postprocess_DRIVERS += writer mysql
endif
postprocess_DEPS_xsltfilter := main
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 2b4ec9479f63..6e569eacda73 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -259,8 +259,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/mysql \
) \
+ connectivity/source/drivers/mysql/mysql \
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
