summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-27 16:36:31 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-29 07:24:36 +0200
commit579f52d41edeec3c83dbaa6dad12ce26a55f0f5b (patch)
treea5696c07c505db7ebbb0075026844f0fe015ad46
parentb3d2b95755723f50c3992faf3d03dceacc545611 (diff)
connectivity: convert hsqldb
-rw-r--r--Repository.mk1
-rw-r--r--RepositoryExternal.mk20
-rw-r--r--connectivity/AllLangResTarget_hsqldb.mk47
-rw-r--r--connectivity/Library_hsqldb.mk80
-rw-r--r--connectivity/Module_connectivity.mk2
5 files changed, 150 insertions, 0 deletions
diff --git a/Repository.mk b/Repository.mk
index 806536214950..178edf275bc1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -280,6 +280,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwm \
guesslang \
helplinker \
+ hsqldb \
hwp \
hyphen \
i18nregexp \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e99786d20821..57a60e8fa313 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1220,6 +1220,26 @@ $(call gb_LinkTarget_set_include,$(1),\
)
endef
+
+ifdef ($(SYSTEM_HSQLDB),YES)
+
+define gb_LinkTarget__use_hsqldb
+
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_HSQLDB \
+ -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" \
+)
+
+endef
+
+else # !SYSTEM_HSQLDB
+
+define gb_LinkTarget__use_hsqldb
+
+endef
+
+endif # SYSTEM_HSQLDB
+
# MacOSX-only frameworks ############################################
# (in alphabetical order)
diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk
new file mode 100644
index 000000000000..923833d10a4b
--- /dev/null
+++ b/connectivity/AllLangResTarget_hsqldb.mk
@@ -0,0 +1,47 @@
+# -*- 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_AllLangResTarget_AllLangResTarget,hsqldb))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
+
+$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\
+ database \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res))
+
+$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\
+ -I$(SRCDIR)/connectivity/source/drivers/hsqldb \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\
+ connectivity/source/drivers/hsqldb/hsqlui.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
new file mode 100644
index 000000000000..fda66122dbaf
--- /dev/null
+++ b/connectivity/Library_hsqldb.mk
@@ -0,0 +1,80 @@
+# -*- 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,hsqldb))
+
+$(eval $(call gb_Library_set_include,hsqldb,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_externals,hsqldb,\
+ hsqldb \
+))
+
+$(eval $(call gb_Library_add_api,hsqldb,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hsqldb,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ jvmfwk \
+ sal \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
+
+$(eval $(call gb_Library_add_exception_objects,hsqldb,\
+ connectivity/source/drivers/hsqldb/HCatalog \
+ connectivity/source/drivers/hsqldb/HColumns \
+ connectivity/source/drivers/hsqldb/HConnection \
+ connectivity/source/drivers/hsqldb/HDriver \
+ connectivity/source/drivers/hsqldb/HStorageAccess \
+ connectivity/source/drivers/hsqldb/HStorageMap \
+ connectivity/source/drivers/hsqldb/HTable \
+ connectivity/source/drivers/hsqldb/HTables \
+ connectivity/source/drivers/hsqldb/HTerminateListener \
+ connectivity/source/drivers/hsqldb/HTools \
+ connectivity/source/drivers/hsqldb/HUser \
+ connectivity/source/drivers/hsqldb/HUsers \
+ connectivity/source/drivers/hsqldb/HView \
+ connectivity/source/drivers/hsqldb/HViews \
+ connectivity/source/drivers/hsqldb/Hservices \
+ connectivity/source/drivers/hsqldb/StorageFileAccess \
+ connectivity/source/drivers/hsqldb/StorageNativeInputStream \
+ connectivity/source/drivers/hsqldb/StorageNativeOutputStream \
+ connectivity/source/drivers/hsqldb/accesslog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 6f242fd9aa22..fea6b1553aed 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -45,8 +45,10 @@ $(eval $(call gb_Module_add_targets,connectivity,\
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
+ AllLangResTarget_hsqldb \
Jar_ConnectivityTools \
Jar_sdbc_hsqldb \
+ Library_hsqldb \
Library_jdbc \
))
endif