[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - 2 commits - connectivity/Configuration_firebird.mk connectivity/Module_connectivity.mk connectivity/Rdb_firebird_sdbc.mk connectivity/registry connectivity/source dbaccess/source postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk Repository.mk scp2/Module_scp2.mk scp2/source
Andrzej J.R. Hunt
andrzej at ahunt.org
Mon Jul 15 12:16:02 PDT 2013
Repository.mk | 2 -
connectivity/Configuration_firebird.mk | 8 ++--
connectivity/Module_connectivity.mk | 1
connectivity/Rdb_firebird_sdbc.mk | 14 -------
connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 6 +--
connectivity/source/drivers/firebird/FDriver.cxx | 2 -
connectivity/source/drivers/firebird/FServices.cxx | 2 -
connectivity/source/drivers/firebird/firebird_sdbc.component | 5 +-
dbaccess/source/core/misc/dsntypes.cxx | 4 --
postprocess/CustomTarget_images.mk | 1
postprocess/CustomTarget_registry.mk | 12 ++----
postprocess/Rdb_services.mk | 3 +
scp2/Module_scp2.mk | 4 +-
scp2/source/base/module_base.scp | 20 ----------
14 files changed, 27 insertions(+), 57 deletions(-)
New commits:
commit 5e9091b8832923a11f58bc1735d459e7da8860ff
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Jul 15 21:11:22 2013 +0200
Make firebird-sdbc install consistent with other drivers.
Change-Id: I01673bda5a08ca793f4fba89ddae036e3f1483e2
diff --git a/Repository.mk b/Repository.mk
index c606288..95ad515 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 49b95b5..47873c7 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 ad2401b..f52b809 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 2679186..0000000
--- 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 3179fd2..2c3fc4f 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 @@
*
************************************************************************ -->
<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>
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx
index 112a5d5..1b4faf6 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 9cc8197..42f34c5 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 2624f2e..ea4e4de 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/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>
+
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index aa24ed9..6eeec00 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/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();
- 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 8dcc689..2e16ad8 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 6963c97..85abfd0 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 4bc5f12..10ce2d4 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)))
commit 2588015e744ff8b46b23354968d813e65e3b82e4
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Mon Jul 15 07:10:18 2013 +0200
Fix --disable-firebird-sdbc.
Change-Id: I040049b4c034858f4be4aa580a17fd8bb5986396
diff --git a/Repository.mk b/Repository.mk
index 593f38b..c606288 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
flat \
file \
filterconfig \
- firebird_sdbc \
+ $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
fpicker \
fps_office \
for \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index dcec656..bd30477 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -17,7 +17,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_calc \
InstallModule_draw \
InstallModule_extensions \
- InstallModule_firebird \
+ $(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
+ InstallModule_firebird \
+ ) \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index b2bfe4a..7a46408 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -37,29 +37,9 @@ Module gid_Module_Prg_Base_Bin
Styles = (HIDDEN_ROOT);
Files = (auto_base_ALL,
gid_File_Share_Registry_Base_Xcd
-/* This should be conditional, but the condition is not working!! */
-/* #if defined ENABLE_FIREBIRD_SDBC */
- ,gid_File_FirebirdSdbc_Rdb
- ,gid_File_FirebirdSdbc_Xcd
-/* #endif */
);
End
-File gid_File_FirebirdSdbc_Rdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program_Services;
- Name = "firebird_sdbc.rdb";
- Styles = (PACKED);
-End
-
-File gid_File_FirebirdSdbc_Xcd
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "firebirdsdbc.xcd";
- Styles = (PACKED);
-End
-
-
Module gid_Module_Brand_Prg_Base
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Base";
More information about the Libreoffice-commits
mailing list