mirror of
https://github.com/PyMySQL/mysqlclient.git
synced 2025-08-15 19:31:54 +08:00
Revert "Hopefully this is just a very minor spacing cleanup."
This reverts commit cdc221a8078382f3a0d97b8b43b155a4f6246297. Conflicts: MySQLdb/MANIFEST.in MySQLdb/metadata.cfg
This commit is contained in:
Andy Dustman
@ -1,102 +1,102 @@
|
||||
import os, sys
|
||||
from ConfigParser import SafeConfigParser
|
||||
|
||||
# This dequote() business is required for some older versions
|
||||
# of mysql_config
|
||||
|
||||
def dequote(s):
|
||||
if s[0] in "\"'" and s[0] == s[-1]:
|
||||
s = s[1:-1]
|
||||
return s
|
||||
|
||||
def compiler_flag(f):
|
||||
return "-%s" % f
|
||||
|
||||
def mysql_config(what):
|
||||
from os import popen
|
||||
|
||||
f = popen("%s --%s" % (mysql_config.path, what))
|
||||
data = f.read().strip().split()
|
||||
ret = f.close()
|
||||
if ret:
|
||||
if ret/256:
|
||||
data = []
|
||||
if ret/256 > 1:
|
||||
raise EnvironmentError("%s not found" % (mysql_config.path,))
|
||||
return data
|
||||
mysql_config.path = "mysql_config"
|
||||
|
||||
def get_config():
|
||||
from setup_common import get_metadata_and_options, enabled, create_release_file
|
||||
|
||||
metadata, options = get_metadata_and_options()
|
||||
|
||||
if 'mysql_config' in options:
|
||||
mysql_config.path = options['mysql_config']
|
||||
|
||||
extra_objects = []
|
||||
static = enabled(options, 'static')
|
||||
if enabled(options, 'embedded'):
|
||||
libs = mysql_config("libmysqld-libs")
|
||||
client = "mysqld"
|
||||
elif enabled(options, 'threadsafe'):
|
||||
libs = mysql_config("libs_r")
|
||||
client = "mysqlclient_r"
|
||||
if not libs:
|
||||
libs = mysql_config("libs")
|
||||
client = "mysqlclient"
|
||||
else:
|
||||
libs = mysql_config("libs")
|
||||
client = "mysqlclient"
|
||||
|
||||
library_dirs = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("L")) ]
|
||||
libraries = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("l")) ]
|
||||
|
||||
removable_compile_args = [ compiler_flag(f) for f in "ILl" ]
|
||||
extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags")
|
||||
if i[:2] not in removable_compile_args ]
|
||||
|
||||
# Copy the arch flags for linking as well
|
||||
extra_link_args = list()
|
||||
for i in range(len(extra_compile_args)):
|
||||
if extra_compile_args[i] == '-arch':
|
||||
extra_link_args += ['-arch', extra_compile_args[i + 1]]
|
||||
|
||||
include_dirs = [ dequote(i[2:])
|
||||
for i in mysql_config('include')
|
||||
if i.startswith(compiler_flag('I')) ]
|
||||
if not include_dirs: # fix for MySQL-3.23
|
||||
include_dirs = [ dequote(i[2:])
|
||||
for i in mysql_config('cflags')
|
||||
if i.startswith(compiler_flag('I')) ]
|
||||
|
||||
if static:
|
||||
extra_objects.append(os.path.join(
|
||||
library_dirs[0],'lib%s.a' % client))
|
||||
|
||||
name = "MySQL-python"
|
||||
if enabled(options, 'embedded'):
|
||||
name = name + "-embedded"
|
||||
metadata['name'] = name
|
||||
|
||||
define_macros = [
|
||||
('version_info', metadata['version_info']),
|
||||
('__version__', metadata['version']),
|
||||
]
|
||||
create_release_file(metadata)
|
||||
del metadata['version_info']
|
||||
ext_options = dict(
|
||||
name = "_mysql",
|
||||
library_dirs = library_dirs,
|
||||
libraries = libraries,
|
||||
extra_compile_args = extra_compile_args,
|
||||
extra_link_args = extra_link_args,
|
||||
include_dirs = include_dirs,
|
||||
extra_objects = extra_objects,
|
||||
define_macros = define_macros,
|
||||
)
|
||||
return metadata, ext_options
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.stderr.write("""You shouldn't be running this directly; it is used by setup.py.""")
|
||||
|
||||
import os, sys
|
||||
from ConfigParser import SafeConfigParser
|
||||
|
||||
# This dequote() business is required for some older versions
|
||||
# of mysql_config
|
||||
|
||||
def dequote(s):
|
||||
if s[0] in "\"'" and s[0] == s[-1]:
|
||||
s = s[1:-1]
|
||||
return s
|
||||
|
||||
def compiler_flag(f):
|
||||
return "-%s" % f
|
||||
|
||||
def mysql_config(what):
|
||||
from os import popen
|
||||
|
||||
f = popen("%s --%s" % (mysql_config.path, what))
|
||||
data = f.read().strip().split()
|
||||
ret = f.close()
|
||||
if ret:
|
||||
if ret/256:
|
||||
data = []
|
||||
if ret/256 > 1:
|
||||
raise EnvironmentError("%s not found" % (mysql_config.path,))
|
||||
return data
|
||||
mysql_config.path = "mysql_config"
|
||||
|
||||
def get_config():
|
||||
from setup_common import get_metadata_and_options, enabled, create_release_file
|
||||
|
||||
metadata, options = get_metadata_and_options()
|
||||
|
||||
if 'mysql_config' in options:
|
||||
mysql_config.path = options['mysql_config']
|
||||
|
||||
extra_objects = []
|
||||
static = enabled(options, 'static')
|
||||
if enabled(options, 'embedded'):
|
||||
libs = mysql_config("libmysqld-libs")
|
||||
client = "mysqld"
|
||||
elif enabled(options, 'threadsafe'):
|
||||
libs = mysql_config("libs_r")
|
||||
client = "mysqlclient_r"
|
||||
if not libs:
|
||||
libs = mysql_config("libs")
|
||||
client = "mysqlclient"
|
||||
else:
|
||||
libs = mysql_config("libs")
|
||||
client = "mysqlclient"
|
||||
|
||||
library_dirs = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("L")) ]
|
||||
libraries = [ dequote(i[2:]) for i in libs if i.startswith(compiler_flag("l")) ]
|
||||
|
||||
removable_compile_args = [ compiler_flag(f) for f in "ILl" ]
|
||||
extra_compile_args = [ i.replace("%", "%%") for i in mysql_config("cflags")
|
||||
if i[:2] not in removable_compile_args ]
|
||||
|
||||
# Copy the arch flags for linking as well
|
||||
extra_link_args = list()
|
||||
for i in range(len(extra_compile_args)):
|
||||
if extra_compile_args[i] == '-arch':
|
||||
extra_link_args += ['-arch', extra_compile_args[i + 1]]
|
||||
|
||||
include_dirs = [ dequote(i[2:])
|
||||
for i in mysql_config('include')
|
||||
if i.startswith(compiler_flag('I')) ]
|
||||
if not include_dirs: # fix for MySQL-3.23
|
||||
include_dirs = [ dequote(i[2:])
|
||||
for i in mysql_config('cflags')
|
||||
if i.startswith(compiler_flag('I')) ]
|
||||
|
||||
if static:
|
||||
extra_objects.append(os.path.join(
|
||||
library_dirs[0],'lib%s.a' % client))
|
||||
|
||||
name = "MySQL-python"
|
||||
if enabled(options, 'embedded'):
|
||||
name = name + "-embedded"
|
||||
metadata['name'] = name
|
||||
|
||||
define_macros = [
|
||||
('version_info', metadata['version_info']),
|
||||
('__version__', metadata['version']),
|
||||
]
|
||||
create_release_file(metadata)
|
||||
del metadata['version_info']
|
||||
ext_options = dict(
|
||||
name = "_mysql",
|
||||
library_dirs = library_dirs,
|
||||
libraries = libraries,
|
||||
extra_compile_args = extra_compile_args,
|
||||
extra_link_args = extra_link_args,
|
||||
include_dirs = include_dirs,
|
||||
extra_objects = extra_objects,
|
||||
define_macros = define_macros,
|
||||
)
|
||||
return metadata, ext_options
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.stderr.write("""You shouldn't be running this directly; it is used by setup.py.""")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user