connectivity: convert postgresql driver

Repository.mk

@@ -525,6 +525,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     nullcanvas \
     OGLTrans \
     passwordcontainer \
+    postgresql-sdbc \
+    postgresql-sdbc-impl \
     simplecanvas \
     slideshow \
     stringresource \

RepositoryExternal.mk

@@ -1240,6 +1240,59 @@ endef
 
 endif # SYSTEM_HSQLDB
 
+
+ifeq ($(SYSTEM_POSTGRESQL),YES)
+
+define gb_LinkTarget__use_postgresql
+
+$(call gb_LinkTarget_add_defs,$(1),\
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	$(POSTGRESQL_INC) \
+	$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	-lpq \
+)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+	$(POSTGRESQL_LIB) \
+)
+
+endef
+
+else # !SYSTEM_POSTGRESQL
+
+define gb_LinkTarget__use_postgresql
+
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(OUTDIR_FOR_BUILD)/inc/postgresql \
+	$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	pq \
+)
+
+ifeq ($(GUI)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	openssl \
+	secur32 \
+	ws2_32 \
+	$(if $(filter YES,$(WITH_LDAP)),ldap) \
+)
+endif
+
+endef
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+	pq \
+))
+
+endif # SYSTEM_POSTGRESQL
+
 # MacOSX-only frameworks ############################################
 # (in alphabetical order)
 

connectivity/Library_postgresql-sdbc-impl.mk

+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (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,postgresql-sdbc-impl))
+
+$(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
+	-DPQ_SDBC_MAJOR=0 \
+	-DPQ_SDBC_MINOR=8 \
+	-DPQ_SDBC_MICRO=2 \
+))
+
+$(eval $(call gb_Library_add_api,postgresql-sdbc-impl,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,postgresql-sdbc-impl,\
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+))
+
+$(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
+	postgresql \
+))
+
+ifneq ($(SYSTEM_POSTGRESQL),YES)
+ifneq ($(GUI)$(COM),WNTMSC)
+
+include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
+
+$(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
+	$(if $(filter-out MACOSX,$(OS)),-Wl,--as-needed) \
+	$(LIBPQ_DEP_LIBS) \
+	$(if $(filter-out MACOSX,$(OS)),-Wl,--no-as-needed) \
+))
+
+endif
+endif
+
+$(eval $(call gb_Library_set_componentfile,postgresql-sdbc-impl,connectivity/source/drivers/postgresql/postgresql-sdbc-impl))
+
+$(eval $(call gb_Library_add_exception_objects,postgresql-sdbc-impl,\
+	connectivity/source/drivers/postgresql/pq_array \
+	connectivity/source/drivers/postgresql/pq_baseresultset \
+	connectivity/source/drivers/postgresql/pq_connection \
+	connectivity/source/drivers/postgresql/pq_databasemetadata \
+	connectivity/source/drivers/postgresql/pq_fakedupdateableresultset \
+	connectivity/source/drivers/postgresql/pq_preparedstatement \
+	connectivity/source/drivers/postgresql/pq_resultset \
+	connectivity/source/drivers/postgresql/pq_resultsetmetadata \
+	connectivity/source/drivers/postgresql/pq_sequenceresultset \
+	connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata \
+	connectivity/source/drivers/postgresql/pq_statement \
+	connectivity/source/drivers/postgresql/pq_statics \
+	connectivity/source/drivers/postgresql/pq_tools \
+	connectivity/source/drivers/postgresql/pq_updateableresultset \
+	connectivity/source/drivers/postgresql/pq_xbase \
+	connectivity/source/drivers/postgresql/pq_xcolumn \
+	connectivity/source/drivers/postgresql/pq_xcolumns \
+	connectivity/source/drivers/postgresql/pq_xcontainer \
+	connectivity/source/drivers/postgresql/pq_xindex \
+	connectivity/source/drivers/postgresql/pq_xindexcolumn \
+	connectivity/source/drivers/postgresql/pq_xindexcolumns \
+	connectivity/source/drivers/postgresql/pq_xindexes \
+	connectivity/source/drivers/postgresql/pq_xkey \
+	connectivity/source/drivers/postgresql/pq_xkeycolumn \
+	connectivity/source/drivers/postgresql/pq_xkeycolumns \
+	connectivity/source/drivers/postgresql/pq_xkeys \
+	connectivity/source/drivers/postgresql/pq_xtable \
+	connectivity/source/drivers/postgresql/pq_xtables \
+	connectivity/source/drivers/postgresql/pq_xuser \
+	connectivity/source/drivers/postgresql/pq_xusers \
+	connectivity/source/drivers/postgresql/pq_xview \
+	connectivity/source/drivers/postgresql/pq_xviews \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Library_postgresql-sdbc.mk

+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (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,postgresql-sdbc))
+
+$(eval $(call gb_Library_add_defs,postgresql-sdbc,\
+	-DPQ_SDBC_MAJOR=0 \
+	-DPQ_SDBC_MINOR=8 \
+	-DPQ_SDBC_MICRO=2 \
+))
+
+$(eval $(call gb_Library_add_api,postgresql-sdbc,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,postgresql-sdbc,\
+	cppu \
+	cppuhelper \
+	sal \
+))
+
+$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc))
+
+$(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\
+	connectivity/source/drivers/postgresql/pq_driver \
+))
+
+# vim: set noet sw=4 ts=4:

connectivity/Module_connectivity.mk

@@ -83,4 +83,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
+ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Library_postgresql-sdbc \
+	Library_postgresql-sdbc-impl \
+	Package_postgresql-sdbc \
+	Rdb_postgresql-sdbc \
+))
+endif
+
 # vim: set noet sw=4 ts=4:

connectivity/Package_postgresql-sdbc.mk

+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (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_Package_Package,connectivity_postgresql-sdbc,$(SRCDIR)/connectivity/source/drivers/postgresql))
+
+$(eval $(call gb_Package_add_file,connectivity_postgresql-sdbc,bin/postgresql-sdbc.ini,postgresql-sdbc.ini))
+
+# vim: set noet sw=4 ts=4:

connectivity/Rdb_postgresql-sdbc.mk

+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (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_Rdb_Rdb,postgresql-sdbc))
+
+$(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
+	connectivity/source/drivers/postgresql/postgresql-sdbc \
+	connectivity/source/drivers/postgresql/postgresql-sdbc-impl \
+))
+
+# vim: set noet sw=4 ts=4: