[Libreoffice-commits] core.git: 2 commits - connectivity/Library_mysqlc.mk external/mysql-connector-cpp solenv/clang-format

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Aug 26 15:51:37 UTC 2018 

 connectivity/Library_mysqlc.mk                       |    2 
 external/mysql-connector-cpp/Library_mysqlcppconn.mk |   89 -------------------
 solenv/clang-format/blacklist                        |    3 
 3 files changed, 1 insertion(+), 93 deletions(-)

New commits:
commit 74ef0185b1945d610c591b7ec3cda67e5c857d22
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 26 14:50:02 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 26 17:51:25 2018 +0200

    don't need dangling Library_mysqlcppconn.mk
    
    Change-Id: I18fbe9feead3d48d9437cc7372eb1373ffb67c3e
    Reviewed-on: https://gerrit.libreoffice.org/59607
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
deleted file mode 100644
index 8efe63be8b05..000000000000
--- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
+++ /dev/null
@@ -1,89 +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,mysqlcppconn))
-
-$(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysql-connector-cpp))
-
-$(eval $(call gb_Library_use_externals,mysqlcppconn, \
-	boost_headers \
-	mariadb-connector-c \
-))
-
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
-	$(if $(filter-out MACOSX,$(OS)),-ldl) \
-))
-
-endif
-
-ifeq ($(OS),MACOSX)
-ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),)
-$(eval $(call gb_Library_use_externals,mysqlcppconn,\
-	    iconv \
-))
-endif
-endif
-
-$(eval $(call gb_Library_add_cxxflags,mysqlcppconn,$(filter-out -Werror=%,$(gb_CXX03FLAGS))))
-
-$(eval $(call gb_Library_set_external_code,mysqlcppconn))
-
-$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
-
-$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
-
-$(eval $(call gb_Library_set_include,mysqlcppconn,\
-	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \
-	-I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \
-))
-
-$(eval $(call gb_Library_add_defs,mysqlcppconn,\
-	-Dmysqlcppconn_EXPORTS \
-	$(if $(filter WNT,$(OS)),\
-	-DCPPDBC_WIN32 \
-	-D_CRT_SECURE_NO_WARNINGS \
-	-D_SCL_SECURE_NO_WARNINGS ) \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
-	-lpthread \
-))
-endif
-
-$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_art_resultset \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_art_rset_metadata \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_connection \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_debug \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_driver \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_metadata \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_parameter_metadata \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_prepared_statement \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset_metadata \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultbind \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset_metadata \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_statement \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_uri \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_util \
-	UnpackedTarball/mysql-connector-cpp/driver/mysql_warning \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_client_api \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/library_loader \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_driver_wrapper \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_connection_wrapper \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_resultset_wrapper \
-	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index d951c529ca74..cd832249bf2d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -4619,9 +4619,6 @@ external/libpng/configs/pnglibconf.h
 external/mariadb-connector-c/configs/linux_my_config.h
 external/mariadb-connector-c/configs/mac_my_config.h
 external/mariadb-connector-c/configs/mysql_version.h
-external/mysql-connector-cpp/binding_config.h
-external/mysql-connector-cpp/config.h
-external/mysql-connector-cpp/version_info.h
 external/neon/configs/config.h
 external/redland/raptor/raptor2.h
 external/redland/raptor/raptor_config.h
commit a42f498f4556b3156f7f2471db08b566bfcbb546
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 26 14:45:25 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 26 17:51:15 2018 +0200

    presumably should be mysqlc here
    
    Change-Id: I328cb639cf1e190e745aa20e0f83b0e3e4fd2f60
    Reviewed-on: https://gerrit.libreoffice.org/59606
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 448f13eeca61..6f4430b74cb8 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -18,7 +18,7 @@ ifeq ($(OS)-$(SYSTEM_MARIADB_CONNECTOR_C),MACOSX-)
 $(eval $(call gb_Library_use_external,mysqlc,iconv))
 endif
 
-$(eval $(call gb_Library_set_include,firebird_sdbc,\
+$(eval $(call gb_Library_set_include,mysqlc,\
 	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \

More information about the Libreoffice-commits mailing list