diff --git a/Repository.mk b/Repository.mk index c60628891cbc..95ad515c5013 100644 --- a/Repository.mk +++ b/Repository.mk @@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ flat \ file \ filterconfig \ - $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \ + $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \ fpicker \ fps_office \ for \ diff --git a/connectivity/Configuration_firebird.mk b/connectivity/Configuration_firebird.mk index 49b95b591f3e..47873c7df704 100644 --- a/connectivity/Configuration_firebird.mk +++ b/connectivity/Configuration_firebird.mk @@ -7,12 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Configuration_Configuration,driver_firebird)) +$(eval $(call gb_Configuration_Configuration,driver_firebird_sdbc)) -$(eval $(call gb_Configuration_add_spool_modules,driver_firebird,connectivity/registry/firebird,\ +$(eval $(call gb_Configuration_add_spool_modules,driver_firebird_sdbc,connectivity/registry/firebird,\ org/openoffice/Office/DataAccess/Drivers-firebird.xcu \ )) -$(eval $(call gb_Configuration_add_localized_datas,driver_firebird,connectivity/registry/firebird,\ +$(eval $(call gb_Configuration_add_localized_datas,driver_firebird_sdbc,connectivity/registry/firebird,\ org/openoffice/Office/DataAccess/Drivers.xcu \ )) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index ad2401b78ac4..f52b8099882f 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -88,7 +88,6 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_firebird \ Library_firebird_sdbc \ - Rdb_firebird_sdbc \ )) endif diff --git a/connectivity/Rdb_firebird_sdbc.mk b/connectivity/Rdb_firebird_sdbc.mk deleted file mode 100644 index 2679186f333b..000000000000 --- a/connectivity/Rdb_firebird_sdbc.mk +++ /dev/null @@ -1,14 +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_Rdb_Rdb,firebird_sdbc)) - -$(eval $(call gb_Rdb_add_components,firebird_sdbc,\ - connectivity/source/drivers/firebird/firebird_sdbc \ -)) diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu index 3179fd24c03c..2c3fc4f0d5a0 100644 --- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu @@ -32,10 +32,10 @@ * ************************************************************************ --> - + - com.sun.star.comp.sdbc.FirebirdDriver + com.sun.star.comp.sdbc.firebird.Driver Firebird @@ -63,7 +63,7 @@ - com.sun.star.comp.sdbc.FirebirdDriver + com.sun.star.comp.sdbc.firebird.Driver Firebird diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx index 112a5d5411fa..1b4faf6f26da 100644 --- a/connectivity/source/drivers/firebird/FDriver.cxx +++ b/connectivity/source/drivers/firebird/FDriver.cxx @@ -89,7 +89,7 @@ void FirebirdDriver::disposing() //------------------------------------------------------------------------------ rtl::OUString FirebirdDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.sdbc.FirebirdDriver"); + return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver"); // this name is referenced in the configuration and in the firebird.xml // Please take care when changing it. } diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx index 9cc8197e84c0..42f34c538c5a 100644 --- a/connectivity/source/drivers/firebird/FServices.cxx +++ b/connectivity/source/drivers/firebird/FServices.cxx @@ -118,7 +118,7 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey) diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component index 2624f2e7b00b..ea4e4de2cfe2 100644 --- a/connectivity/source/drivers/firebird/firebird_sdbc.component +++ b/connectivity/source/drivers/firebird/firebird_sdbc.component @@ -8,9 +8,10 @@ * --> - - + + diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index aa24ed9da541..6eeec003e014 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -300,9 +300,7 @@ Sequence ODsnTypeCollection::getDefaultDBSettings( const OUString //------------------------------------------------------------------------- bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const { - const OUString sEmbeddedDatabaseURL = getEmbeddedDatabase(); - WildCard aWildCard(sEmbeddedDatabaseURL); - return aWildCard.Matches(_sURL); + return _sURL.startsWith( "sdbc:embedded:" ); } // ----------------------------------------------------------------------------- OUString ODsnTypeCollection::getEmbeddedDatabase() const diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 8dcc6891dee7..2e16ad8aad7d 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -49,6 +49,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 6963c9759490..85abfd06d344 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -339,6 +339,11 @@ postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu postprocess_DRIVERS += hsqldb jdbc endif +ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +postprocess_FILES_main += \ + $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu +postprocess_DRIVERS += firebird_sdbc +endif ifeq ($(ENABLE_TDEAB),TRUE) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu endif @@ -426,13 +431,6 @@ postprocess_FILES_postgresqlsdbc := $(postprocess_MOD)/org/openoffice/Office/Dat postprocess_DRIVERS += postgresql endif -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -postprocess_XCDS += firebirdsdbc.xcd -postprocess_DEPS_firebirdsdbc := main -postprocess_FILES_firebirdsdbc := $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu -postprocess_DRIVERS += firebird -endif - ifeq (unx,$(GUIBASE)) ifneq (,$(or $(filter TRUEYES,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) postprocess_XCDS += gnome.xcd diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 4bc5f12f677e..10ce2d4eb42c 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -240,6 +240,9 @@ $(eval $(call gb_Rdb_add_components,services,\ wizards/com/sun/star/wizards/report/report \ wizards/com/sun/star/wizards/table/table \ ) \ + $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \ + connectivity/source/drivers/firebird/firebird_sdbc \ + ) \ )) ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))