diff options
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | connectivity/Library_dbpool2.mk | 63 | ||||
-rw-r--r-- | connectivity/Module_connectivity.mk | 1 | ||||
-rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
4 files changed, 66 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 13886b74e4b2..66d29e1f0d0b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -400,6 +400,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ avmediawin \ cached1 \ collator_data \ + dbpool2 \ deployment \ deploymentgui \ dict_ja \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk new file mode 100644 index 000000000000..c2418f208551 --- /dev/null +++ b/connectivity/Library_dbpool2.mk @@ -0,0 +1,63 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,dbpool2)) + +$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2)) + +$(eval $(call gb_Library_add_package_headers,dbpool2,connectivity_inc)) + +$(eval $(call gb_Library_set_include,dbpool2,\ + $$(INCLUDE) \ + -I$(SRCDIR)/connectivity/source/inc \ +)) + +$(eval $(call gb_Library_add_api,dbpool2,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,dbpool2,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + sal \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,dbpool2,\ + connectivity/source/cpool/ZConnectionWrapper \ + connectivity/source/cpool/ZDriverWrapper \ + connectivity/source/cpool/ZPooledConnection \ + connectivity/source/cpool/ZConnectionPool \ + connectivity/source/cpool/ZPoolCollection \ + connectivity/source/cpool/Zregistration \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 901a42cc5e72..f51855cc872c 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Jar_sdbc_hsqldb \ Library_dbtools \ Library_sdbc2 \ + Library_dbpool2 \ )) # vim: set noet sw=4 ts=4: diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index c9d8c84e9256..c1225cdacff8 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -42,6 +42,7 @@ my_components = \ component/canvas/source/simplecanvas/simplecanvas \ component/canvas/source/vcl/vclcanvas \ component/comphelper/util/comphelp \ + component/connectivity/source/cpool/dbpool2 \ component/connectivity/source/dbtools/dbtools \ component/connectivity/source/manager/sdbc2 \ component/configmgr/source/configmgr \ @@ -146,7 +147,6 @@ my_components += \ component/reportdesign/util/rptui \ component/reportdesign/util/rptxml \ dbase \ - dbpool2 \ flat \ localebe1 \ mysql \ |