[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk

2018-04-12 Thread Miklos Vajna 
 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 
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 
Reviewed-by: Miklos Vajna 

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:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk

2018-04-10 Thread Miklos Vajna 
 dbaccess/CppunitTest_dbaccess_RowSetClones.mk   |1 -
 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk |2 --
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk|4 
 3 files changed, 7 deletions(-)

New commits:
commit c0e285d840373a26cee98deaccb521c1f8f1efdb
Author: Miklos Vajna 
Date:   Tue Apr 10 13:59:16 2018 +0200

dbaccess: fix --without-java build

Change-Id: I9c1ac64745301deda1501806534f13c1527a33b3
Reviewed-on: https://gerrit.libreoffice.org/52670
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk 
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 9713871988ea..ddf69296cb28 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -68,7 +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/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 443213fe9410..6a92256937b3 100644
--- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
+++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
@@ -22,7 +22,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest,
 dbaxml \
 dbtools \
 firebird_sdbc \
-jvmfwk \
 sal \
 subsequenttest \
 utl \
@@ -48,7 +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/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 b6bc33a2cf87..bb4fd0c8e2d6 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -23,7 +23,6 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \
 dbaxml \
 dbtools \
 firebird_sdbc \
-jvmfwk \
 sal \
 subsequenttest \
 utl \
@@ -42,15 +41,12 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\
 $(eval $(call gb_CppunitTest_use_ure,dbaccess_hsqldb_test))
 $(eval $(call gb_CppunitTest_use_vcl,dbaccess_hsqldb_test))
 
-$(eval $(call gb_CppunitTest_use_java_ure,dbaccess_hsqldb_test))
-
 $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\
 basic/util/sb \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 connectivity/source/cpool/dbpool2 \
 connectivity/source/drivers/firebird/firebird_sdbc \
-connectivity/source/drivers/jdbc/jdbc \
 connectivity/source/manager/sdbc2 \
 dbaccess/util/dba \
 dbaccess/source/filter/xml/dbaxml \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk dbaccess/CppunitTest_dbaccess_hsqldb_test.mk

2014-07-09 Thread Stephan Bergmann 
 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk |1 +
 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk|1 +
 2 files changed, 2 insertions(+)

New commits:
commit c0ba062b23a009a95bfd59fe77c1dbcd642d94ff
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jul 9 09:36:59 2014 +0200

CppunitTests using jvmfwk indirectly need sunjavaplugin

Change-Id: I0e4408bb8301b5fd5da4ee5f4efab5b1ae4f5ca7

diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk 
b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
index 2fe7e94..0331398 100644
--- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
+++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk
@@ -25,6 +25,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest,
 jvmfwk \
 sal \
 subsequenttest \
+sunjavaplugin \
 utl \
 test \
 tk \
diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk 
b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
index 75b7a3e..1fb6f53 100644
--- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \
 jvmfwk \
 sal \
 subsequenttest \
+sunjavaplugin \
 utl \
 test \
 tk \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits