-
-
Notifications
You must be signed in to change notification settings - Fork 433
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move mysql-ext to using mariadb connector
- Loading branch information
Showing
19 changed files
with
2,446 additions
and
261 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,54 @@ | ||
| # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: | ||
| import os | ||
|
|
||
| if SM.mysql_root: | ||
| for cxx in builder.targets: | ||
| arch = cxx.target.arch | ||
| binary = SM.ExtLibrary(builder, cxx, 'dbi.mysql.ext') | ||
| binary.compiler.cxxincludes += [ | ||
| os.path.join(SM.mysql_root[arch], 'include'), | ||
| os.path.join(SM.mms_root, 'core', 'sourcehook') | ||
| ] | ||
| if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang': | ||
| binary.compiler.cxxflags += ['-fno-rtti'] | ||
| elif binary.compiler.family == 'msvc': | ||
| binary.compiler.cxxflags += ['/GR-'] | ||
| libmariadb = builder.Build('mariadb/AMBuilder') | ||
| libopenssl = {} | ||
| if os.name != 'nt': | ||
| libopenssl = builder.Build('openssl/AMBuilder') | ||
|
|
||
| for cxx in builder.targets: | ||
| arch = cxx.target.arch | ||
| binary = SM.ExtLibrary(builder, cxx, 'dbi.mysql.ext') | ||
| binary.compiler.cxxincludes += [ | ||
| os.path.join(SM.mms_root, 'core', 'sourcehook'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'include'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'connector', 'include'), | ||
| ] | ||
| if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang': | ||
| binary.compiler.cxxflags += ['-fno-rtti'] | ||
| elif binary.compiler.family == 'msvc': | ||
| binary.compiler.cxxflags += ['/GR-'] | ||
|
|
||
| if binary.compiler.target.platform == 'linux' or binary.compiler.target.platform == 'mac': | ||
| binary.compiler.postlink += [ | ||
| os.path.join(SM.mysql_root[arch], 'lib', 'libmysqlclient_r.a'), | ||
| '-lz', | ||
| '-lpthread', | ||
| '-lm', | ||
| ] | ||
| if binary.compiler.target.platform == 'linux': | ||
| binary.compiler.postlink += ['-lrt'] | ||
| elif binary.compiler.target.platform == 'windows': | ||
| binary.compiler.defines += ['WIN32_LEAN_AND_MEAN'] | ||
| binary.compiler.postlink += [ | ||
| os.path.join(SM.mysql_root[arch], 'lib', 'mysqlclient.lib'), | ||
| 'wsock32.lib' | ||
| ] | ||
| binary.compiler.postlink += [ | ||
| libmariadb[arch].binary, | ||
| ] | ||
|
|
||
| binary.sources += [ | ||
| '../../public/smsdk_ext.cpp', | ||
| 'mysql/MyBasicResults.cpp', | ||
| 'mysql/MyBoundResults.cpp', | ||
| 'mysql/MyDatabase.cpp', | ||
| 'mysql/MyDriver.cpp', | ||
| 'mysql/MyStatement.cpp', | ||
| 'extension.cpp' | ||
| if binary.compiler.target.platform == 'linux': | ||
| binary.compiler.postlink += [ | ||
| '-lz', | ||
| '-lpthread', | ||
| '-lm', | ||
| '-lrt', | ||
| libopenssl['ssl-' + arch].binary, | ||
| libopenssl['crypto-' + arch].binary, | ||
| ] | ||
| elif binary.compiler.target.platform == 'windows': | ||
| binary.compiler.defines += ['WIN32_LEAN_AND_MEAN'] | ||
| binary.compiler.postlink += [ | ||
| 'ws2_32.lib', | ||
| 'shlwapi.lib', | ||
| 'crypt32.lib', | ||
| 'secur32.lib', | ||
| ] | ||
|
|
||
| if binary.compiler.family == 'msvc' and binary.compiler.version >= 1900: | ||
| binary.sources += [ 'msvc15hack.c' ] | ||
| binary.compiler.linkflags += ['legacy_stdio_definitions.lib', 'legacy_stdio_wide_specifiers.lib'] | ||
| binary.compiler.defines += ['HAVE_STRUCT_TIMESPEC'] | ||
|
|
||
| SM.extensions += [builder.Add(binary)] | ||
| binary.sources += [ | ||
| '../../public/smsdk_ext.cpp', | ||
| 'mysql/MyBasicResults.cpp', | ||
| 'mysql/MyBoundResults.cpp', | ||
| 'mysql/MyDatabase.cpp', | ||
| 'mysql/MyDriver.cpp', | ||
| 'mysql/MyStatement.cpp', | ||
| 'extension.cpp' | ||
| ] | ||
|
|
||
| SM.extensions += [builder.Add(binary)] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # vim: sts=2 ts=8 sw=2 tw=99 et ft=python: | ||
| import os, platform | ||
|
|
||
| builder.SetBuildFolder('libmariadb') | ||
|
|
||
| rvalue = {} | ||
| for cxx in builder.targets: | ||
| binary = SM.StaticLibrary(builder, cxx, 'mariadb') | ||
| binary.compiler.includes += [ | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'include'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'connector', 'include'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'connector', 'libmariadb'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'mariadb', 'connector', 'external', 'zlib'), | ||
|
|
||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'openssl', 'include'), | ||
| os.path.join(builder.sourcePath, 'extensions', 'mysql', 'openssl', 'lib', 'include'), | ||
| ] | ||
|
|
||
| binary.compiler.defines += [ | ||
| 'HAVE_COMPRESS', | ||
| 'LIBMARIADB', | ||
| 'THREAD', | ||
| ] | ||
| # Work around mariadb warnings. | ||
| if binary.compiler.target.platform == 'linux': | ||
| binary.compiler.cflags += [ | ||
| '-Wno-shift-count-overflow', | ||
| '-Wno-tautological-constant-out-of-range-compare', | ||
| ] | ||
|
|
||
| binary.sources += [ | ||
| 'connector/plugins/auth/my_auth.c', | ||
| 'connector/plugins/auth/old_password.c', | ||
| 'connector/plugins/compress/c_zlib.c', | ||
| 'connector/plugins/pvio/pvio_socket.c', | ||
| 'connector/libmariadb/ma_array.c', | ||
| 'connector/libmariadb/ma_charset.c', | ||
| 'connector/libmariadb/ma_decimal.c', | ||
| 'connector/libmariadb/ma_hashtbl.c', | ||
| 'connector/libmariadb/ma_net.c', | ||
| 'connector/libmariadb/mariadb_charset.c', | ||
| 'connector/libmariadb/ma_time.c', | ||
| 'connector/libmariadb/ma_default.c', | ||
| 'connector/libmariadb/ma_errmsg.c', | ||
| 'connector/libmariadb/mariadb_lib.c', | ||
| 'connector/libmariadb/ma_list.c', | ||
| 'connector/libmariadb/ma_pvio.c', | ||
| 'connector/libmariadb/ma_tls.c', | ||
| 'connector/libmariadb/ma_alloc.c', | ||
| 'connector/libmariadb/ma_compress.c', | ||
| 'connector/libmariadb/ma_init.c', | ||
| 'connector/libmariadb/ma_password.c', | ||
| 'connector/libmariadb/ma_ll2str.c', | ||
| 'connector/libmariadb/ma_sha1.c', | ||
| 'connector/libmariadb/mariadb_stmt.c', | ||
| 'connector/libmariadb/ma_loaddata.c', | ||
| 'connector/libmariadb/ma_stmt_codec.c', | ||
| 'connector/libmariadb/ma_string.c', | ||
| 'connector/libmariadb/ma_dtoa.c', | ||
| 'connector/libmariadb/mariadb_rpl.c', | ||
| 'connector/libmariadb/ma_io.c', | ||
| 'connector/libmariadb/mariadb_async.c', | ||
| 'connector/libmariadb/ma_context.c', | ||
| 'ma_client_plugin.c', | ||
| ] | ||
|
|
||
| if binary.compiler.target.platform == 'linux': | ||
| # TLS | ||
| binary.compiler.defines += [ | ||
| 'HAVE_OPENSSL', 'HAVE_TLS' | ||
| ] | ||
| binary.sources += [ | ||
| 'connector/libmariadb/secure/openssl.c', | ||
| ] | ||
| elif binary.compiler.target.platform == 'windows': | ||
| binary.compiler.defines += [ | ||
| 'HAVE_DLOPEN', | ||
| '_CRT_SECURE_NO_WARNINGS', | ||
| '_CRT_NONSTDC_NO_DEPRECATE', | ||
| 'HAVE_SCHANNEL', 'HAVE_TLS' | ||
| ] | ||
| binary.sources += [ | ||
| 'connector/libmariadb/win32_errmsg.c', | ||
| # TLS | ||
| 'connector/libmariadb/secure/schannel.c', | ||
| 'connector/libmariadb/secure/ma_schannel.c', | ||
| 'connector/libmariadb/secure/schannel_certs.c', | ||
| # ZLIB | ||
| 'connector/external/zlib/adler32.c', | ||
| 'connector/external/zlib/compress.c', | ||
| 'connector/external/zlib/crc32.c', | ||
| 'connector/external/zlib/deflate.c', | ||
| 'connector/external/zlib/gzclose.c', | ||
| 'connector/external/zlib/gzlib.c', | ||
| 'connector/external/zlib/gzread.c', | ||
| 'connector/external/zlib/gzwrite.c', | ||
| 'connector/external/zlib/infback.c', | ||
| 'connector/external/zlib/inffast.c', | ||
| 'connector/external/zlib/inflate.c', | ||
| 'connector/external/zlib/inftrees.c', | ||
| 'connector/external/zlib/trees.c', | ||
| 'connector/external/zlib/uncompr.c', | ||
| 'connector/external/zlib/zutil.c', | ||
| ] | ||
|
|
||
| rvalue[binary.compiler.target.arch] = builder.Add(binary) |
Oops, something went wrong.