Repository.mk | 1 connectivity/Library_odbc.mk | 22 connectivity/Library_odbcbase.mk | 55 connectivity/Module_connectivity.mk | 4 connectivity/source/drivers/odbc/OConnection.cxx | 569 +++ connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 1707 +++++++++ connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 1323 +++++++ connectivity/source/drivers/odbc/ODriver.cxx | 213 + connectivity/source/drivers/odbc/OPreparedStatement.cxx | 952 +++++ connectivity/source/drivers/odbc/OResultSet.cxx | 1865 ++++++++++ connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 306 + connectivity/source/drivers/odbc/OStatement.cxx | 1117 +++++ connectivity/source/drivers/odbc/OTools.cxx | 808 ++++ connectivity/source/drivers/odbcbase/OConnection.cxx | 569 --- connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx | 1707 --------- connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 1323 ------- connectivity/source/drivers/odbcbase/ODriver.cxx | 213 - connectivity/source/drivers/odbcbase/OPreparedStatement.cxx | 952 ----- connectivity/source/drivers/odbcbase/OResultSet.cxx | 1865 ---------- connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx | 306 - connectivity/source/drivers/odbcbase/OStatement.cxx | 1117 ----- connectivity/source/drivers/odbcbase/OTools.cxx | 808 ---- solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 23 files changed, 8881 insertions(+), 8922 deletions(-)
New commits: commit 692c724f5e71f685c269085983828e7539274ecb Author: Marcos Paulo de Souza <[email protected]> Date: Wed Dec 4 12:12:01 2013 -0200 fdo#60698: Merge odbcbase into odbc We odbcbase is just used inside odbc library, so merge them. Change-Id: I4f4b34873b570ddcf1065c49e5310a1e73092fd6 diff --git a/Repository.mk b/Repository.mk index 1fffb73..6c4d488 100644 --- a/Repository.mk +++ b/Repository.mk @@ -302,7 +302,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ mtfrenderer \ mysql \ odbc \ - odbcbase \ odfflatxml \ offacc \ oox \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 82d447c..a29ccc2 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -20,14 +20,23 @@ $(eval $(call gb_Library_set_include,odbc,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -$(eval $(call gb_Library_use_external,odbc,odbc_headers)) +$(eval $(call gb_Library_add_defs,odbc,\ + -DOOO_DLLIMPLEMENTATION_ODBCBASE \ +)) + +$(eval $(call gb_Library_use_externals,odbc,\ + boost_headers \ + odbc_headers \ +)) $(eval $(call gb_Library_use_libraries,odbc,\ - odbcbase \ cppu \ cppuhelper \ + comphelper \ + dbtools \ sal \ salhelper \ $(gb_UWINAPI) \ @@ -37,6 +46,15 @@ $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ connectivity/source/drivers/odbc/OFunctions \ + connectivity/source/drivers/odbc/OPreparedStatement \ + connectivity/source/drivers/odbc/OStatement \ + connectivity/source/drivers/odbc/OResultSetMetaData \ + connectivity/source/drivers/odbc/OResultSet \ + connectivity/source/drivers/odbc/OTools \ + connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet \ + connectivity/source/drivers/odbc/ODatabaseMetaData \ + connectivity/source/drivers/odbc/ODriver \ + connectivity/source/drivers/odbc/OConnection \ )) # vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk deleted file mode 100644 index 2db5823..0000000 --- a/connectivity/Library_odbcbase.mk +++ /dev/null @@ -1,55 +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,odbcbase)) - -$(eval $(call gb_Library_set_warnings_not_errors,odbcbase)) - -$(eval $(call gb_Library_use_sdk_api,odbcbase)) - -$(eval $(call gb_Library_set_include,odbcbase,\ - $$(INCLUDE) \ - -I$(SRCDIR)/connectivity/inc \ - -I$(SRCDIR)/connectivity/source/inc \ - -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ -)) - -$(eval $(call gb_Library_add_defs,odbcbase,\ - -DOOO_DLLIMPLEMENTATION_ODBCBASE \ -)) - -$(eval $(call gb_Library_use_externals,odbcbase,\ - boost_headers \ - odbc_headers \ -)) - -$(eval $(call gb_Library_use_libraries,odbcbase,\ - cppu \ - cppuhelper \ - sal \ - salhelper \ - dbtools \ - comphelper \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,odbcbase,\ - connectivity/source/drivers/odbcbase/OPreparedStatement \ - connectivity/source/drivers/odbcbase/OStatement \ - connectivity/source/drivers/odbcbase/OResultSetMetaData \ - connectivity/source/drivers/odbcbase/OResultSet \ - connectivity/source/drivers/odbcbase/OTools \ - connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet \ - connectivity/source/drivers/odbcbase/ODatabaseMetaData \ - connectivity/source/drivers/odbcbase/ODriver \ - connectivity/source/drivers/odbcbase/OConnection \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index b49a9ad..ae3511c 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -23,9 +23,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_file \ Library_flat \ Library_mysql \ - $(if $(filter ANDROID IOS,$(OS)),, \ - Library_odbc \ - Library_odbcbase) \ + $(if $(filter ANDROID IOS,$(OS)),,Library_odbc) \ Library_sdbc2 \ )) diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OConnection.cxx rename to connectivity/source/drivers/odbc/OConnection.cxx diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx rename to connectivity/source/drivers/odbc/ODatabaseMetaData.cxx diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx rename to connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/ODriver.cxx rename to connectivity/source/drivers/odbc/ODriver.cxx diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OPreparedStatement.cxx rename to connectivity/source/drivers/odbc/OPreparedStatement.cxx diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OResultSet.cxx rename to connectivity/source/drivers/odbc/OResultSet.cxx diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx rename to connectivity/source/drivers/odbc/OResultSetMetaData.cxx diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OStatement.cxx rename to connectivity/source/drivers/odbc/OStatement.cxx diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx similarity index 100% rename from connectivity/source/drivers/odbcbase/OTools.cxx rename to connectivity/source/drivers/odbc/OTools.cxx diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 11628ef..9cc2079 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -69,7 +69,6 @@ gb_EXTRAMERGEDLIBS := \ $(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,DBCONNECTIVITY,mork)) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ - $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ odfflatxml \ offacc \ oox \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
