|
3 | 3 | from distutils.msvccompiler import get_build_version
|
4 | 4 |
|
5 | 5 |
|
6 |
| -def get_default_connector(client): |
7 |
| - if client == "mariadbclient": |
8 |
| - return os.path.join( |
9 |
| - os.environ["ProgramFiles"], "MariaDB", "MariaDB Connector C" |
10 |
| - ) |
11 |
| - elif client == "mysqlclient": |
12 |
| - return os.path.join( |
13 |
| - os.environ["ProgramFiles"], "MySQL", "MySQL Connector C 6.1" |
14 |
| - ) |
15 |
| - else: |
16 |
| - raise ValueError("Unknown client library") |
17 |
| - |
18 |
| - |
19 |
| -def find_library(client, connector=None): |
20 |
| - if not connector: |
21 |
| - connector = get_default_connector(client) |
22 |
| - paths = [] |
23 |
| - if client == "mariadbclient": |
24 |
| - paths.append(os.path.join(connector, "lib", "mariadb", client + ".lib")) |
25 |
| - paths.append(os.path.join(connector, "lib", client + ".lib")) |
26 |
| - elif client == "mysqlclient": |
27 |
| - vcversion = int(get_build_version()) |
28 |
| - paths.append(os.path.join(connector, "lib", "vs%d" % vcversion)) |
29 |
| - else: |
30 |
| - raise ValueError("Unknown client library") |
31 |
| - for path in paths: |
32 |
| - if os.path.exists(path): |
33 |
| - return path |
34 |
| - return None |
35 |
| - |
36 |
| - |
37 | 6 | def get_config():
|
38 | 7 | from setup_common import get_metadata_and_options, create_release_file
|
39 | 8 |
|
40 | 9 | metadata, options = get_metadata_and_options()
|
41 | 10 |
|
42 |
| - client = os.environ.get("MYSQLCLIENT_CLIENT", options.get("client")) |
| 11 | + client = "mariadbclient" |
43 | 12 | connector = os.environ.get("MYSQLCLIENT_CONNECTOR", options.get("connector"))
|
44 |
| - |
45 |
| - if not client: |
46 |
| - for client in ("mariadbclient", "mysqlclient"): |
47 |
| - if find_library(client, connector): |
48 |
| - break |
49 |
| - else: |
50 |
| - raise RuntimeError("Couldn't find MySQL or MariaDB Connector") |
51 |
| - |
52 | 13 | if not connector:
|
53 |
| - connector = get_default_connector(client) |
| 14 | + connector = os.path.join( |
| 15 | + os.environ["ProgramFiles"], "MariaDB", "MariaDB Connector C" |
| 16 | + ) |
54 | 17 |
|
55 | 18 | extra_objects = []
|
56 | 19 |
|
57 |
| - vcversion = int(get_build_version()) |
58 |
| - if client == "mariadbclient": |
59 |
| - library_dirs = [ |
60 |
| - os.path.join(connector, "lib", "mariadb"), |
61 |
| - os.path.join(connector, "lib"), |
62 |
| - ] |
63 |
| - libraries = [ |
64 |
| - "kernel32", |
65 |
| - "advapi32", |
66 |
| - "wsock32", |
67 |
| - "shlwapi", |
68 |
| - "Ws2_32", |
69 |
| - "crypt32", |
70 |
| - "secur32", |
71 |
| - "bcrypt", |
72 |
| - client, |
73 |
| - ] |
74 |
| - include_dirs = [ |
75 |
| - os.path.join(connector, "include", "mariadb"), |
76 |
| - os.path.join(connector, "include"), |
77 |
| - ] |
78 |
| - elif client == "mysqlclient": |
79 |
| - library_dirs = [ |
80 |
| - os.path.join(connector, r"lib\vs%d" % vcversion), |
81 |
| - os.path.join(connector, "lib"), |
82 |
| - ] |
83 |
| - libraries = ["kernel32", "advapi32", "wsock32", client] |
84 |
| - include_dirs = [os.path.join(connector, r"include")] |
85 |
| - else: |
86 |
| - raise ValueError("Unknown client library") |
| 20 | + library_dirs = [ |
| 21 | + os.path.join(connector, "lib", "mariadb"), |
| 22 | + os.path.join(connector, "lib"), |
| 23 | + ] |
| 24 | + libraries = [ |
| 25 | + "kernel32", |
| 26 | + "advapi32", |
| 27 | + "wsock32", |
| 28 | + "shlwapi", |
| 29 | + "Ws2_32", |
| 30 | + "crypt32", |
| 31 | + "secur32", |
| 32 | + "bcrypt", |
| 33 | + client, |
| 34 | + ] |
| 35 | + include_dirs = [ |
| 36 | + os.path.join(connector, "include", "mariadb"), |
| 37 | + os.path.join(connector, "include"), |
| 38 | + ] |
87 | 39 |
|
88 | 40 | extra_link_args = ["/MANIFEST"]
|
89 | 41 |
|
|
0 commit comments