mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
libreoffice/connectivity/Module_connectivity.mk

147 lines
2.9 KiB
Makefile
Raw Normal View History

connectivity: convert headers to gbuild
2011-12-18 15:38:06 -05:00
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
#
Move to MPLv2 license headers, with ESC decision and author's permission.
2013-04-24 17:14:03 +01:00
# This file is part of the LibreOffice project.
connectivity: convert headers to gbuild
2011-12-18 15:38:06 -05:00
#
Move to MPLv2 license headers, with ESC decision and author's permission.
2013-04-24 17:14:03 +01:00
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
connectivity: convert headers to gbuild
2011-12-18 15:38:06 -05:00
#
$(eval $(call gb_Module_Module,connectivity))
$(eval $(call gb_Module_add_targets,connectivity,\
the resources were not all packed into one file originally
2012-04-06 17:29:02 +02:00
AllLangResTarget_cnr \
AllLangResTarget_sdbcl \
AllLangResTarget_sdberr \
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_calc \
Configuration_dbase \
Configuration_flat \
Configuration_mysql \
Configuration_odbc \
connectivity: convert calc to gbuild
2011-12-22 16:59:41 -05:00
Library_calc \
keep the list sorted
2012-04-06 17:29:45 +02:00
Library_dbase \
Library_dbpool2 \
Library_dbtools \
connectivity: convert file to gbuild
2011-12-25 11:40:33 -05:00
Library_file \
connectivity: convert flat to gbuild
2011-12-25 11:54:34 -05:00
Library_flat \
keep the list sorted
2012-04-06 17:29:45 +02:00
Library_mysql \
No point with ODBC for Android or iOS Sure, little point for them with the other stuff here in connectivity either, but those parts at least compile. If/when I get back to getting the --disable-database-connectivity thing to work, all of conectivity will be bypassed for Android and iOS, of course. Change-Id: I4eeeb9ccdf46fb2e1df8bf75aef63e17cbb97bbf
2012-10-05 12:30:49 +03:00
$(if $(filter ANDROID IOS,$(OS)),, \
Library_odbc \
Library_odbcbase) \
keep the list sorted
2012-04-06 17:29:45 +02:00
Library_sdbc2 \
connectivity: convert headers to gbuild
2011-12-18 15:38:06 -05:00
))
connectivity: convert ConnectivityTools to gbuild
2011-12-19 21:21:22 -05:00
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_hsqldb \
Configuration_jdbc \
connectivity: don't build jars unless java is enabled
2011-12-22 19:55:36 -05:00
Jar_sdbc_hsqldb \
connectivity: convert hsqldb
2012-03-27 16:36:31 +02:00
Library_hsqldb \
connectivity: convert jdbc to gbuild
2011-12-25 11:16:20 -05:00
Library_jdbc \
connectivity: convert ConnectivityTools to gbuild
2011-12-19 21:21:22 -05:00
))
endif
Get rid of (most uses of) GUI GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-12 01:07:09 +02:00
ifneq ($(OS),WNT)
connectivity: convert macab to gbuild
2011-12-21 21:43:58 -05:00
connectivity: convert kab to gbuild
2011-12-20 19:41:57 -05:00
ifeq ($(ENABLE_KAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_kab \
connectivity: convert kab to gbuild
2011-12-20 19:41:57 -05:00
Library_kab1 \
Library_kabdrv1 \
))
endif
connectivity: convert macab to gbuild
2011-12-21 21:43:58 -05:00
fix TDE FTBFS Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
2012-08-18 16:17:12 +02:00
ifeq ($(ENABLE_TDEAB),TRUE)
connectivity: convert tdeab to gbuild Change-Id: I6653686ef251bdf64610ff9bab7e27e39acee799
2012-05-23 13:58:31 +02:00
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_tdeab \
Library_tdeab1 \
Library_tdeabdrv1 \
))
endif
connectivity: convert macab to gbuild
2011-12-21 21:43:58 -05:00
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,connectivity,\
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_macab \
connectivity: convert macab to gbuild
2011-12-21 21:43:58 -05:00
Library_macab1 \
Library_macabdrv1 \
))
endif
connectivity: convert kab to gbuild
2011-12-20 19:41:57 -05:00
endif
Get rid of (most uses of) GUI GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-12 01:07:09 +02:00
ifeq ($(OS),WNT)
connectivity: convert ado to gbuild
2011-12-20 12:15:42 -05:00
$(eval $(call gb_Module_add_targets,connectivity,\
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_ado \
connectivity: convert ado to gbuild
2011-12-20 12:15:42 -05:00
Library_ado \
))
endif
connectivity: convert evoab to gbuild
2011-12-22 16:34:35 -05:00
ifeq ($(ENABLE_EVOAB2),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
rename evoab2 back to evoab
2012-04-14 09:53:48 +02:00
Configuration_evoab \
Library_evoab \
connectivity: convert evoab to gbuild
2011-12-22 16:34:35 -05:00
))
endif
connectivity: convert postgresql driver
2012-04-05 10:53:08 +02:00
ifeq ($(BUILD_POSTGRESQL_SDBC),YES)
$(eval $(call gb_Module_add_targets,connectivity,\
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
Configuration_postgresql \
connectivity: convert postgresql driver
2012-04-05 10:53:08 +02:00
Library_postgresql-sdbc \
Library_postgresql-sdbc-impl \
Package_postgresql-sdbc \
Rdb_postgresql-sdbc \
))
endif
switch build system to mork driver implementation On all non windows platforms no mozilla is used any more. On windows it used for O and OE address book access. Once alternative implementation for it exists, mozilla can be stripped there too. Change-Id: I54144005e6a284326b45a34eb958d170e872471e Reviewed-on: https://gerrit.libreoffice.org/637 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-18 11:23:52 +02:00
ifeq ($(OS),WNT)
First fix for fdo#56902 Restrict moz to windows, and build vars also impacts nss, connectivity Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282 Reviewed-on: https://gerrit.libreoffice.org/1233 Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-04 03:35:14 +01:00
ifeq ($(WITH_MOZAB4WIN),YES)
connectivity: convert mozab (hopefully .-)
2012-04-05 17:59:36 +02:00
$(eval $(call gb_Module_add_targets,connectivity,\
Some clean-up of mork-related changs And reverted for now the configure error when --enable-mozilla on non-Windows; it is still used for other features, too. Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
2012-09-18 18:25:29 +02:00
Configuration_mozab \
connectivity: convert mozab (hopefully .-)
2012-04-05 17:59:36 +02:00
Library_mozab \
Library_mozabdrv \
))
WITH_MOZAB4WIN=NO still needs mozbootstrap Change-Id: I9b9cd072c885387988492a6a945a9ca099635ecf
2012-12-05 17:21:40 +01:00
else
$(eval $(call gb_Module_add_targets,connectivity,\
Library_mozbootstrap \
))
switch build system to mork driver implementation On all non windows platforms no mozilla is used any more. On windows it used for O and OE address book access. Once alternative implementation for it exists, mozilla can be stripped there too. Change-Id: I54144005e6a284326b45a34eb958d170e872471e Reviewed-on: https://gerrit.libreoffice.org/637 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-18 11:23:52 +02:00
endif
No mork on non-desktop OSes Change-Id: Ic9391a020915cdb794434d8728bad1bd64dd20c8
2012-10-10 13:06:29 +03:00
else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
switch build system to mork driver implementation On all non windows platforms no mozilla is used any more. On windows it used for O and OE address book access. Once alternative implementation for it exists, mozilla can be stripped there too. Change-Id: I54144005e6a284326b45a34eb958d170e872471e Reviewed-on: https://gerrit.libreoffice.org/637 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-18 11:23:52 +02:00
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
$(eval $(call gb_Module_add_targets,connectivity,\
switch build system to mork driver implementation On all non windows platforms no mozilla is used any more. On windows it used for O and OE address book access. Once alternative implementation for it exists, mozilla can be stripped there too. Change-Id: I54144005e6a284326b45a34eb958d170e872471e Reviewed-on: https://gerrit.libreoffice.org/637 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-18 11:23:52 +02:00
Configuration_mork \
Some clean-up of mork-related changs And reverted for now the configure error when --enable-mozilla on non-Windows; it is still used for other features, too. Change-Id: I1ce5ff1a7a3d140a1ab7ba1e905166d91229c926
2012-09-18 18:25:29 +02:00
Executable_mork_helper \
switch build system to mork driver implementation On all non windows platforms no mozilla is used any more. On windows it used for O and OE address book access. Once alternative implementation for it exists, mozilla can be stripped there too. Change-Id: I54144005e6a284326b45a34eb958d170e872471e Reviewed-on: https://gerrit.libreoffice.org/637 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-09-18 11:23:52 +02:00
Library_mork \
Always package at least mozbootstrap ...if not even mozab. Otherwise, there is no implementation of com.sun.star.mozilla.MozillaBootstrap and "File - Digital Signatures... - Sign Document..." cannot show any certificates from Mozilla profiles. Change-Id: Ie9b73fad798b2c2a3b52ba374ea967401694f685
2012-11-07 13:37:57 +01:00
Library_mozbootstrap \
connectivity: convert configuration
2012-04-06 20:10:17 +02:00
))
put the test and the thing to be tested inside the same if condition Change-Id: I0bb23749cd74797838fe45ef6e739f75879eea6a
2012-10-10 11:12:37 +01:00
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_mork \
))
connectivity: convert mozab (hopefully .-)
2012-04-05 17:59:36 +02:00
endif
Get rid of (most uses of) GUI GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-12 01:07:09 +02:00
ifeq ($(OS),WNT)
enable ado driver unit test again The problem is that ado driver creates a link file in the tree leaving it dirty: tinderbox doesn't like it. Instead of reading the mdb file direct from srcdir we copy it first to workdir and read it from there with the new function: getPathFromWorkdir. Thank you Norbert! Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc Reviewed-on: https://gerrit.libreoffice.org/1004 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-11-07 23:15:37 +01:00
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_ado \
))
endif
fdo#53070 add complete unit test Change-Id: I34f7a8ae58fa6af4c8cfdd13330420f1576fa2c9
2012-11-03 09:38:14 +01:00
ConnectivityTools.jar is only used by complex tests Change-Id: I480ec61e44f008e8f473825063a2ac0575970d7b
2012-05-25 12:03:17 +02:00
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
Jar_ConnectivityTools \
))
disable broken complex test
2012-05-01 08:55:41 +02:00
# FIXME: Does not work. Convert to JUnit.
mork driver: add list tables and unit test Change-Id: I594b24341eb38c05523f578c1dc2e43d90544f30
2012-09-30 19:53:40 +02:00
# JunitTest_complex \
ConnectivityTools.jar is only used by complex tests Change-Id: I480ec61e44f008e8f473825063a2ac0575970d7b
2012-05-25 12:03:17 +02:00
endif
connectivity: convert subsequent test
2012-04-07 07:33:39 +02:00
ORowSetValue: clean up sign/unsigned union member Also switch BOOLEAN constructor from sal_Bool to bool. old/new signed/unsigned storage situation: ------------------------------------------------------- SQL type | signed | unsigned old | unsigned new ------------------------------------------------------- TINYINT | sal_Int8 | sal_Int16 | sal_uInt8 SMALLINT | sal_Int16 | sal_Int32 | sal_uInt16 INTEGER | sal_Int32 | sal_Int64 | sal_uInt32 BIGINT | sal_Int64 | pValue (String*) | sal_uInt64 ------------------------------------------------------- When sticking an UNSIGNED TINYINT into an Any, silently promote it to UNSIGNED SMALLINT (that is sal_uInt16), else Any would take it as a sal_Bool and normalise to sal_True (1) or sal_False (0). When constructing an ORowSetValue from a sal_Bool, silently keep it as an unsigned 8 bit integer (that is understand it as a sal_uInt8). This will work in most cases, since when asked back for a bool or sal_Bool, we'll give back the right value. Only code looking at the type tag could possibly make a "wrong" decision. The main (hopefully only?) path through which this would happen is through an implementation of XParameters::setBoolean XRowUpdate::updateBoolean that would use its sal_Bool argument to construct an ORowSetValue. So make sure each implementation constructs a proper BOOLEAN so as not to get confused. For authorship/copyright purposes, this patch is a cooperation between Lionel Elie Mamane <lionel@mamane.lu> and David Ostrovsky <david@ostrovsky.org> Change-Id: I3f1f08716127147f077bff4edb6ec558b1b09e09
2013-02-04 11:12:57 +01:00
# general tests
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_commontools \
))
connectivity: convert headers to gbuild
2011-12-18 15:38:06 -05:00
# vim: set noet sw=4 ts=4:
Reference in New Issue Copy Permalink