summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-23 13:58:31 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-29 07:24:52 +0200
commitaa99f076047dac84ec80d588bfcbe4c0e6db34f1 (patch)
tree30d401a7880e0b850b1d4f5a9a09f60ffc8615a3
parentb4e3d59c00b5c1c1d84f111bf9be40a8eea23327 (diff)
connectivity: convert tdeab to gbuild
Change-Id: I6653686ef251bdf64610ff9bab7e27e39acee799
-rw-r--r--RepositoryExternal.mk15
-rw-r--r--connectivity/Configuration_tdeab.mk38
-rw-r--r--connectivity/Library_tdeab1.mk56
-rw-r--r--connectivity/Library_tdeabdrv1.mk66
-rw-r--r--connectivity/Module_connectivity.mk8
-rw-r--r--connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu (renamed from connectivity/source/drivers/kab/tdeab.xcu)4
-rw-r--r--postprocess/packcomponents/makefile.mk2
-rw-r--r--postprocess/packregistry/makefile.mk2
8 files changed, 187 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 90dac4a174d6..a45c9b707227 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1122,6 +1122,21 @@ $(call gb_LinkTarget_set_include,$(1),\
)
endef
+ifeq ($(ENABLE_TDE),YES)
+
+define gb_LinkTarget__use_tde
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(TDE_LIBS) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(TDE_CFLAGS) \
+)
+endef
+
+endif # ENABLE_TDE
+
define gb_LinkTarget__use_gobject
$(call gb_LinkTarget_add_libs,$(1),\
$(GOBJECT_LIBS) \
diff --git a/connectivity/Configuration_tdeab.mk b/connectivity/Configuration_tdeab.mk
new file mode 100644
index 000000000000..190b85e72dfe
--- /dev/null
+++ b/connectivity/Configuration_tdeab.mk
@@ -0,0 +1,38 @@
+# -*- 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_Configuration_Configuration,driver_tdeab))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\
+ org/openoffice/Office/DataAccess/Drivers-tab.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\
+ org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
new file mode 100644
index 000000000000..63602f490306
--- /dev/null
+++ b/connectivity/Library_tdeab1.mk
@@ -0,0 +1,56 @@
+# -*- 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,tdeab1))
+
+$(eval $(call gb_Library_use_externals,tdeab1,\
+ tde \
+))
+
+$(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
+
+$(eval $(call gb_Library_use_api,tdeab1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,tdeab1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ sal \
+ salhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,tdeab1,\
+ connectivity/source/drivers/kab/KDriver \
+ connectivity/source/drivers/kab/KServices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
new file mode 100644
index 000000000000..1f3a8ea80f9f
--- /dev/null
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -0,0 +1,66 @@
+# -*- 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,tdeabdrv1))
+
+$(eval $(call gb_Library_use_api,tdeabdrv1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_libs,tdeabdrv1,\
+ -lkabc \
+))
+
+$(eval $(call gb_Library_use_libraries,tdeabdrv1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ dbtools \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\
+ connectivity/source/drivers/kab/KColumns \
+ connectivity/source/drivers/kab/KTable \
+ connectivity/source/drivers/kab/KTables \
+ connectivity/source/drivers/kab/KCatalog \
+ connectivity/source/drivers/kab/KResultSet \
+ connectivity/source/drivers/kab/KStatement \
+ connectivity/source/drivers/kab/KPreparedStatement \
+ connectivity/source/drivers/kab/KDatabaseMetaData \
+ connectivity/source/drivers/kab/KConnection \
+ connectivity/source/drivers/kab/KResultSetMetaData \
+ connectivity/source/drivers/kab/kcondition \
+ connectivity/source/drivers/kab/korder \
+ connectivity/source/drivers/kab/kfields \
+ connectivity/source/drivers/kab/KDEInit \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 38c7124b5dcd..d3c6948fe483 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -73,6 +73,14 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
+ifeq ($(ENABLE_TAB),TRUE)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Configuration_tdeab \
+ Library_tdeab1 \
+ Library_tdeabdrv1 \
+))
+endif
+
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_macab \
diff --git a/connectivity/source/drivers/kab/tdeab.xcu b/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
index 7615b5592849..6e7907aa2197 100644
--- a/connectivity/source/drivers/kab/tdeab.xcu
+++ b/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <node oor:name="Installed">
+<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <node oor:name="Installed" install:module="tdeab">
<node oor:name="sdbc:address:tdeab" oor:op="replace">
<prop oor:name="Driver">
<value>com.sun.star.comp.sdbc.tdeab.Driver</value>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a0e4bde10812..dd063e1a7e2e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -247,7 +247,7 @@ my_components += component/ucb/source/ucp/gvfs/ucpgvfs
.END
.IF "$(ENABLE_TDEAB)" != ""
-my_components += tdeab1
+my_components += component/connectivity/source/drivers/kab/tdeab1
.END
.IF "$(ENABLE_TDE)" != ""
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 1644fff6ec76..2d1d396890ba 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -340,7 +340,7 @@ MY_FILES_main += \
MY_DRIVERS += hsqldb jdbc
.END
.IF "$(ENABLE_TDEAB)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/tdeab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
.END
.IF "$(ENABLE_KAB)" == "TRUE"
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu