diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
commit | 07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d (patch) | |
tree | 5f80a6862e44b938c4e7f62f457d1b48f5a0195b /connectivity/source/drivers/kab | |
parent | 007f16ef7ad40ae932df884ba04f0de71928b852 (diff) |
TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
Diffstat (limited to 'connectivity/source/drivers/kab')
-rw-r--r-- | connectivity/source/drivers/kab/KDEInit.h | 13 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/makefile.mk | 118 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/tdeab.xcu | 46 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/tdeab.xml | 77 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/tdeab1.component | 34 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/tdeabdrv.map | 9 |
6 files changed, 289 insertions, 8 deletions
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h index 9a5ea70da211..b70df86adfeb 100644 --- a/connectivity/source/drivers/kab/KDEInit.h +++ b/connectivity/source/drivers/kab/KDEInit.h @@ -34,6 +34,17 @@ #define KAB_DRIVER_VERSION_MAJOR 0 #define KAB_DRIVER_VERSION_MINOR 2 +#ifdef ENABLE_TDE + +// the minimum TDE version which is required at runtime +#define MIN_KDE_VERSION_MAJOR 14 +#define MIN_KDE_VERSION_MINOR 0 + +#define MAX_KDE_VERSION_MAJOR 255 +#define MAX_KDE_VERSION_MINOR 255 + +#else // ENABLE_TDE + // the minimum KDE version which is required at runtime #define MIN_KDE_VERSION_MAJOR 3 #define MIN_KDE_VERSION_MINOR 2 @@ -41,6 +52,8 @@ #define MAX_KDE_VERSION_MAJOR 3 #define MAX_KDE_VERSION_MINOR 6 +#endif // ENABLE_TDE + #endif // CONNECTIVITY_KAB_KDEINIT_H diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index 9494037d236b..bce8aa21f4b6 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -28,8 +28,6 @@ PRJ=..$/..$/.. PRJINC=..$/.. PRJNAME=connectivity -TARGET=kab -TARGET2=$(TARGET)drv ENABLE_EXCEPTIONS=TRUE VISIBILITY_HIDDEN=TRUE @@ -42,6 +40,9 @@ VISIBILITY_HIDDEN=TRUE .IF "$(GUI)" == "UNX" .IF "$(ENABLE_KAB)" == "TRUE" +TARGET=kab +TARGET2=$(TARGET)drv + CFLAGS+=$(KDE_CFLAGS) .IF "$(KDE_ROOT)"!="" @@ -130,12 +131,113 @@ DEF2NAME= $(SHL2TARGET) # --- Targets ----------------------------------- .ELSE # "$(ENABLE_KAB)" == "TRUE" -dummy: -# nothing +.IF "$(ENABLE_TDEAB)" == "TRUE" + +TARGET=tdeab +TARGET2=$(TARGET)drv + +CFLAGS+=$(TDE_CFLAGS) +CFLAGS+=-DENABLE_TDE -I$(SRCDIR)/shell/inc +CFLAGSCXX+=-DENABLE_TDE -I$(SRCDIR)/shell/inc + +.IF "$(TDE_ROOT)"!="" + EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib + .IF "$(OS)$(CPU)" == "LINUXX" + EXTRALIBPATHS+=-L$(TDE_ROOT)$/lib64 + .ENDIF +.ENDIF + +# === TDEAB base library ========================== + +# --- Files ------------------------------------- + +SLOFILES= \ +$(SLO)$/KDriver.obj \ +$(SLO)$/KServices.obj + +DEPOBJFILES= \ +$(SLO2FILES) + +# --- Library ----------------------------------- + +SHL1VERSIONMAP=$(SOLARENV)/src/component.map + +SHL1TARGET= $(TARGET)$(TDEAB_MAJOR) +SHL1OBJS=$(SLOFILES) +SHL1STDLIBS=\ +$(COMPHELPERLIB) \ +$(CPPULIB) \ +$(CPPUHELPERLIB) \ +$(DBTOOLSLIB) \ +$(SALLIB) \ +$(SALHELPERLIB) + +SHL1DEPN= +SHL1IMPLIB= i$(TARGET) + +SHL1DEF= $(MISC)$/$(SHL1TARGET).def + +DEF1NAME= $(SHL1TARGET) + +# === TDEAB impl library ========================== + +# --- Files ------------------------------------- + +SLO2FILES=\ +$(SLO)$/KColumns.obj \ +$(SLO)$/KTable.obj \ +$(SLO)$/KTables.obj \ +$(SLO)$/KCatalog.obj \ +$(SLO)$/KResultSet.obj \ +$(SLO)$/KStatement.obj \ +$(SLO)$/KPreparedStatement.obj \ +$(SLO)$/KDatabaseMetaData.obj \ +$(SLO)$/KConnection.obj \ +$(SLO)$/KResultSetMetaData.obj \ +$(SLO)$/kcondition.obj \ +$(SLO)$/korder.obj \ +$(SLO)$/kfields.obj \ +$(SLO)$/KDEInit.obj + +TDEAB_LIB=$(TDE_LIBS) -lkabc + +# --- Library ----------------------------------- + +SHL2VERSIONMAP=$(TARGET2).map + +SHL2TARGET= $(TARGET2)$(TDEAB_MAJOR) +SHL2OBJS=$(SLO2FILES) +SHL2STDLIBS=\ +$(CPPULIB) \ +$(CPPUHELPERLIB) \ +$(SALLIB) \ +$(SALHELPERLIB) \ +$(DBTOOLSLIB) \ +$(COMPHELPERLIB) \ +$(TDEAB_LIB) + +SHL2DEPN= +SHL2IMPLIB= i$(TARGET2) + +SHL2DEF= $(MISC)$/$(SHL2TARGET).def + +DEF2NAME= $(SHL2TARGET) + +# --- Targets ----------------------------------- +.ELSE # "$(ENABLE_TDEAB)" == "TRUE" + TARGET=kab + TARGET2=$(TARGET)drv + + dummy: + # nothing + +.ENDIF .ENDIF .ELSE # "$(GUI)" == "UNX" +TARGET=kab +TARGET2=$(TARGET)drv dummy: # nothing @@ -145,10 +247,10 @@ dummy: .INCLUDE : $(PRJ)$/target.pmk -ALLTAR : $(MISC)/kab1.component +ALLTAR : $(MISC)/$(TARGET)1.component -$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - kab1.component +$(MISC)/$(TARGET)1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + $(TARGET)1.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt kab1.component + $(SOLARENV)/bin/createcomponent.xslt $(TARGET)1.component diff --git a/connectivity/source/drivers/kab/tdeab.xcu b/connectivity/source/drivers/kab/tdeab.xcu new file mode 100644 index 000000000000..7615b5592849 --- /dev/null +++ b/connectivity/source/drivers/kab/tdeab.xcu @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--*********************************************************************** + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * 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"> + <node oor:name="sdbc:address:tdeab" oor:op="replace"> + <prop oor:name="Driver"> + <value>com.sun.star.comp.sdbc.tdeab.Driver</value> + </prop> + <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> + <value xml:lang="en-US">TDE Address Book</value> + </prop> + <node oor:name="Features"> + <node oor:name="EscapeDateTime" oor:op="replace"> + <prop oor:name="Value" oor:type="xs:boolean"> + <value>true</value> + </prop> + </node> + </node> + </node> + </node> +</oor:component-data> diff --git a/connectivity/source/drivers/kab/tdeab.xml b/connectivity/source/drivers/kab/tdeab.xml new file mode 100644 index 000000000000..ef3d7bff387b --- /dev/null +++ b/connectivity/source/drivers/kab/tdeab.xml @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding="UTF-8"?> +<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> +<module-description xmlns:xlink="http://www.w3.org/1999/xlink"> + <module-name> tdeab1 </module-name> + <component-description> + <Author>Eric Bischoff</Author> + <Name>com.sun.star.comp.sdbc.tdeab.Driver</Name> + <description>This library implements the database driver for TDE address book formats.</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com.sun.star.sdbc.Driver</supported-service> + <service-dependency> ... </service-dependency> + </component-description> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> + + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.beans.PropertyAttribute </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.FetchDirection </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.SQLWarning </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdbc.ColumnSearch </type> + <type> com.sun.star.sdbc.ColumnValue </type> + <type> com.sun.star.sdbc.DataType </type> + <type> com.sun.star.sdbc.XDriver </type> + <type> com.sun.star.sdbc.TransactionIsolation </type> + <type> com.sun.star.sdbc.ResultSetType </type> + <type> com.sun.star.sdbc.ResultSetConcurrency </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.sdbcx.CompareBookmark </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> +</module-description> diff --git a/connectivity/source/drivers/kab/tdeab1.component b/connectivity/source/drivers/kab/tdeab1.component new file mode 100644 index 000000000000..407277136cbb --- /dev/null +++ b/connectivity/source/drivers/kab/tdeab1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.sdbc.tdeab.Driver"> + <service name="com.sun.star.sdbc.Driver"/> + </implementation> +</component> diff --git a/connectivity/source/drivers/kab/tdeabdrv.map b/connectivity/source/drivers/kab/tdeabdrv.map new file mode 100644 index 000000000000..5de866f2e52f --- /dev/null +++ b/connectivity/source/drivers/kab/tdeabdrv.map @@ -0,0 +1,9 @@ +UDK_3_0_0 { + global: + createKabConnection; + initKApplication; + shutdownKApplication; + matchKDEVersion; + local: + *; +}; |