From 5c8120d8253eae2ca49c8f76cbf91b115956427c Mon Sep 17 00:00:00 2001 From: wpirkl Date: Fri, 24 Jan 2020 13:07:19 +0100 Subject: [PATCH] fix it for mariadb --- README.md | 14 ++++++++++++++ setup_windows.py | 4 ++-- site.cfg | 3 ++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 79af2573..61acfaa2 100644 --- a/README.md +++ b/README.md @@ -70,3 +70,17 @@ $ pip install mysqlclient Documentation is hosted on [Read The Docs](https://mysqlclient.readthedocs.io/) +# Mariadb Connector C + +If you want to build against mariadb-connector-c download it from https://mariadb.com/downloads/#connectors + +Make sure it's installed under `C:\Program Files (x86)\mariadb-connector-c` with the following folder structure: +- C:\Program Files (x86)\mariadb-connector-c\bin +- C:\Program Files (x86)\mariadb-connector-c\include +- C:\Program Files (x86)\mariadb-connector-c\include\mysql +- C:\Program Files (x86)\mariadb-connector-c\lib +- C:\Program Files (x86)\mariadb-connector-c\lib\mariadb +- C:\Program Files (x86)\mariadb-connector-c\lib\mariadb\plugin +- C:\Program Files (x86)\mariadb-connector-c\lib\plugin + +(didn't try with win64 yet diff --git a/setup_windows.py b/setup_windows.py index cb2cbab0..582f0d4d 100644 --- a/setup_windows.py +++ b/setup_windows.py @@ -16,9 +16,9 @@ def get_config(): vcversion = int(get_build_version()) if client == "mariadbclient": - library_dirs = [os.path.join(connector, 'lib', 'mariadb')] + library_dirs = [os.path.join(connector, 'lib')] libraries = ['kernel32', 'advapi32', 'wsock32', 'shlwapi', 'Ws2_32', client ] - include_dirs = [os.path.join(connector, 'include', 'mariadb')] + include_dirs = [os.path.join(connector, 'include')] else: library_dirs = [os.path.join(connector, r'lib\vs%d' % vcversion), os.path.join(connector, "lib")] diff --git a/site.cfg b/site.cfg index 6b4596a4..41d6416d 100644 --- a/site.cfg +++ b/site.cfg @@ -9,4 +9,5 @@ static = False # http://stackoverflow.com/questions/1972259/mysql-python-install-problem-using-virtualenv-windows-pip # Windows connector libs for MySQL. You need a 32-bit connector for your 32-bit Python build. -connector = C:\Program Files (x86)\MySQL\MySQL Connector C 6.1 +#connector = C:\mariadb-connector +connector = C:\Program Files (x86)\mariadb-connector-c