[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk
Miklos Vajna
vmiklos at collabora.co.uk
Thu Apr 12 16:50:26 UTC 2018
dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 6 ------
dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk | 2 --
dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 6 ------
3 files changed, 14 deletions(-)
New commits:
commit 2eef6fd6fc5477aaef5ee82a5189d8f0b595a4a2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Apr 12 11:57:41 2018 +0200
dbaccess: fix --without-java build once more
Change-Id: I49bf0f066db8a988ee9a091cac1adf5ebcaa2afe
Reviewed-on: https://gerrit.libreoffice.org/52777
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 2240a82b8761..ddf69296cb28 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_RowSetClones,\
boost_headers \
))
-$(eval $(call gb_CppunitTest_use_jars,dbaccess_RowSetClones, \
- sdbc_hsqldb \
-))
-
$(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
basegfx \
comphelper \
@@ -72,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\
comphelper/util/comphelp \
configmgr/source/configmgr \
connectivity/source/drivers/firebird/firebird_sdbc \
- connectivity/source/drivers/hsqldb/hsqldb \
- connectivity/source/drivers/jdbc/jdbc \
connectivity/source/manager/sdbc2 \
dbaccess/util/dba \
dbaccess/util/dbu \
diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
index 07de4d9e104f..6a92256937b3 100644
--- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
+++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_embeddeddb_performancetest,
configmgr/source/configmgr \
connectivity/source/cpool/dbpool2 \
connectivity/source/drivers/firebird/firebird_sdbc \
- connectivity/source/drivers/hsqldb/hsqldb \
- connectivity/source/drivers/jdbc/jdbc \
connectivity/source/manager/sdbc2 \
dbaccess/util/dba \
dbaccess/source/filter/xml/dbaxml \
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 0a300f83f249..bb4fd0c8e2d6 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
configmgr/source/configmgr \
connectivity/source/cpool/dbpool2 \
connectivity/source/drivers/firebird/firebird_sdbc \
- connectivity/source/drivers/hsqldb/hsqldb \
- connectivity/source/drivers/jdbc/jdbc \
connectivity/source/manager/sdbc2 \
dbaccess/util/dba \
dbaccess/source/filter/xml/dbaxml \
@@ -71,10 +69,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
xmloff/util/xo \
))
-$(eval $(call gb_CppunitTest_use_jars,dbaccess_hsqldb_test,\
- sdbc_hsqldb \
-))
-
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test))
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list