From 4c232e49621065d6b12e087333f44a224f788d71 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Wed, 3 Sep 2014 15:25:01 +0200 Subject: [PATCH] remove build dependency on cmake for sqlconnector Change-Id: I73a56b902099939972b8f5c8a55d231459e5421b --- external/mysqlcppconn/Library_mysqlcppconn.mk | 9 ----- .../mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 2 +- external/mysqlcppconn/version_info.h | 42 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 external/mysqlcppconn/version_info.h diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index 1670de8005b6..2abfcb3a482f 100644 --- a/external/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk @@ -74,13 +74,4 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \ )) -$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: $(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h - -ifeq ($(SYSTEM_BOOST),) -MYSQLCPPCONN_BOOST:=-DBOOST_ROOT:STRING=$(call gb_UnpackedTarball_get_dir,boost) -endif - -$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h: $(call gb_UnpackedTarball_get_target,mysqlcppconn) $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o - cd $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn && cmake $(MYSQLCPPCONN_BOOST) ../../../UnpackedTarball/mysqlcppconn/ - # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 5f5a437efcd5..9647c383775a 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -12,13 +12,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mysqlcppconn)) $(eval $(call gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL))) $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,version_info.h,external/mysqlcppconn/version_info.h)) $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,external/mysqlcppconn/binding_config.h)) $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ external/mysqlcppconn/patches/warnings.patch.0 \ - external/mysqlcppconn/patches/cmake.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/version_info.h b/external/mysqlcppconn/version_info.h new file mode 100644 index 000000000000..a0203da33864 --- /dev/null +++ b/external/mysqlcppconn/version_info.h @@ -0,0 +1,42 @@ +/* +Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + +The MySQL Connector/C++ is licensed under the terms of the GPLv2 +, like most +MySQL Connectors. There are special exceptions to the terms and +conditions of the GPLv2 as it is applied to this software, see the +FLOSS License Exception +. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +/* Please do not edit this file - it is generated by cmake. Edit its source file instead. */ + +#define MYCPPCONN_MAJOR_VERSION 1 +#define MYCPPCONN_MINOR_VERSION 1 +#define MYCPPCONN_PATCH_VERSION 4 + +#define SETUP_VERSION "1.01.0004" +#define DRIVER_VERSION "0" SETUP_VERSION + +#define MYCPPCONN_VERSION SETUP_VERSION +#define MYCPPCONN_FILEVER 1,1,4,0 +#define MYCPPCONN_PRODUCTVER MYCPPCONN_FILEVER +#define MYCPPCONN_STRFILEVER "1, 1, 4, 0\0" +#define MYCPPCONN_STRPRODUCTVER MYCPPCONN_STRFILEVER + +#define MYCPPCONN_STRSERIES "1.1" +#define MYCPPCONN_STRQUALITY "GA" +#define MYCPPCONN_STRVERSION "1.1.4" -- 2.11.4.GIT