Make firebird-sdbc install consistent with other drivers.

Change-Id: I01673bda5a08ca793f4fba89ddae036e3f1483e2

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 \

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:

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
 

connectivity/Rdb_firebird_sdbc.mk

@@ -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 \
-))

connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu

@@ -32,10 +32,10 @@
  *
  ************************************************************************ -->
 <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="firebird">
+  <node oor:name="Installed" install:module="firebird_sdbc">
     <node oor:name="sdbc:embedded:firebird" oor:op="replace">
       <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+        <value>com.sun.star.comp.sdbc.firebird.Driver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
         <value xml:lang="en-US">Firebird</value>
@@ -63,7 +63,7 @@
     </node>
     <node oor:name="sdbc:firebird:*" oor:op="replace">
       <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+        <value>com.sun.star.comp.sdbc.firebird.Driver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
         <value xml:lang="en-US">Firebird</value>

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.
 }

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)

connectivity/source/drivers/firebird/firebird_sdbc.component

@@ -8,9 +8,10 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.sdbc.FirebirdDriver">
+  <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
 </component>
+

dbaccess/source/core/misc/dsntypes.cxx

@@ -300,9 +300,7 @@ Sequence<PropertyValue> ODsnTypeCollection::getDefaultDBSettings( const OUString
 //-------------------------------------------------------------------------
 bool ODsnTypeCollection::isEmbeddedDatabase( const OUString& _sURL ) const
 {
-    const OUString sEmbeddedDatabaseURL = getEmbeddedDatabase();
+    return _sURL.startsWith( "sdbc:embedded:" );
-    WildCard aWildCard(sEmbeddedDatabaseURL);
-    return aWildCard.Matches(_sURL);
 }
 // -----------------------------------------------------------------------------
 OUString ODsnTypeCollection::getEmbeddedDatabase() const

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))
 

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

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)))