diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-09-02 14:37:23 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 08:18:03 +0000 |
commit | 72699595aaa3ecb8975050b6dfc6fde437770493 (patch) | |
tree | 11f1d8416f7d5e7fec2dc0c1cb4f196ea0a290fc /connectivity | |
parent | d465e8273f1ee54450f0bf59c41bda93c54b3db4 (diff) |
remove KDE3 support, --enable-kde and --enable-kdeab
With the new RHEL6-era baseline TDF can finally ship KDE4 support.
Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3
Reviewed-on: https://gerrit.libreoffice.org/18267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/Configuration_kab.mk | 20 | ||||
-rw-r--r-- | connectivity/Library_kab1.mk | 43 | ||||
-rw-r--r-- | connectivity/Library_kabdrv1.mk | 56 | ||||
-rw-r--r-- | connectivity/Module_connectivity.mk | 8 | ||||
-rw-r--r-- | connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu | 37 | ||||
-rw-r--r-- | connectivity/source/drivers/kab/kab1.component | 25 |
6 files changed, 0 insertions, 189 deletions
diff --git a/connectivity/Configuration_kab.mk b/connectivity/Configuration_kab.mk deleted file mode 100644 index 1f04d681f49c..000000000000 --- a/connectivity/Configuration_kab.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# 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/. -# - -$(eval $(call gb_Configuration_Configuration,driver_kab)) - -$(eval $(call gb_Configuration_add_spool_modules,driver_kab,connectivity/registry/kab,\ - org/openoffice/Office/DataAccess/Drivers-kab.xcu \ -)) - -$(eval $(call gb_Configuration_add_localized_datas,driver_kab,connectivity/registry/kab,\ - org/openoffice/Office/DataAccess/Drivers.xcu \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk deleted file mode 100644 index 4a301b6f2d1e..000000000000 --- a/connectivity/Library_kab1.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# This file is part of the LibreOffice project. -# -# 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/. -# - -$(eval $(call gb_Library_Library,kab1)) - -$(eval $(call gb_Library_use_externals,kab1, \ - boost_headers \ - kde \ -)) - -$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1)) - -$(eval $(call gb_Library_use_sdk_api,kab1)) - -$(eval $(call gb_Library_set_include,kab1,\ - -I$(SRCDIR)/connectivity/source/inc \ - $$(INCLUDE) \ - -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ -)) - -$(eval $(call gb_Library_use_libraries,kab1,\ - comphelper \ - cppu \ - cppuhelper \ - dbtools \ - sal \ - salhelper \ - tl \ -)) - -$(eval $(call gb_Library_add_exception_objects,kab1,\ - connectivity/source/drivers/kab/KDriver \ - connectivity/source/drivers/kab/KServices \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk deleted file mode 100644 index dee91e33dfbc..000000000000 --- a/connectivity/Library_kabdrv1.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# This file is part of the LibreOffice project. -# -# 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/. -# - -$(eval $(call gb_Library_Library,kabdrv1)) - -$(eval $(call gb_Library_use_sdk_api,kabdrv1)) - -$(eval $(call gb_Library_use_externals,kabdrv1,\ - boost_headers \ - kde \ -)) - -$(eval $(call gb_Library_set_include,kabdrv1,\ - -I$(SRCDIR)/connectivity/source/inc \ - $$(INCLUDE) \ - -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ -)) - -$(eval $(call gb_Library_add_libs,kabdrv1,\ - -lkabc \ -)) - -$(eval $(call gb_Library_use_libraries,kabdrv1,\ - cppu \ - cppuhelper \ - sal \ - salhelper \ - dbtools \ - comphelper \ -)) - -$(eval $(call gb_Library_add_exception_objects,kabdrv1,\ - 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 4616eb3d3292..b45ca5c0e83a 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -45,14 +45,6 @@ endif ifneq ($(OS),WNT) -ifeq ($(ENABLE_KAB),TRUE) -$(eval $(call gb_Module_add_targets,connectivity,\ - Configuration_kab \ - Library_kab1 \ - Library_kabdrv1 \ -)) -endif - ifeq ($(ENABLE_TDEAB),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_tdeab \ diff --git a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu deleted file mode 100644 index bc0fd521f85d..000000000000 --- a/connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> -<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="kab"> - <node oor:name="sdbc:address:kab" oor:op="replace"> - <prop oor:name="Driver"> - <value>com.sun.star.comp.sdbc.kab.Driver</value> - </prop> - <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> - <value xml:lang="en-US">KDE 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/kab1.component b/connectivity/source/drivers/kab/kab1.component deleted file mode 100644 index 1bde060cbfd9..000000000000 --- a/connectivity/source/drivers/kab/kab1.component +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="kab" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.sdbc.kab.Driver"> - <service name="com.sun.star.sdbc.Driver"/> - </implementation> -</component> |