delegate to env variable for x64 extension, is -x64 on appveyor, has been x64 elsewhere

This commit is contained in:
wiredfool 2015-06-15 17:49:25 -07:00
parent 87d5c8a506
commit 1bdb3653d0
3 changed files with 5 additions and 4 deletions

View File

@ -10,7 +10,7 @@ from config import *
def setup_vms():
ret = []
for py in pythons.keys():
for arch in ('', '-x64'):
for arch in ('', X64_EXT):
ret.append("virtualenv -p c:/Python%s%s/python.exe --clear %s%s%s" %
(py, arch, VIRT_BASE, py, arch))
ret.append("%s%s%s\Scripts\pip.exe install nose" %
@ -96,7 +96,7 @@ def main(op):
compilers[(compiler_version, 32)]),
footer()])))
scripts.append(("%sx64" % py_version,
scripts.append(("%s%s" % (py_version, X64_EXT),
"\n".join([header(op),
build_one("%sx64" %py_version,
compilers[(compiler_version, 64)]),

View File

@ -10,6 +10,7 @@ pythons = {#'26':7,
'34':7.1}
VIRT_BASE = "c:/vp/"
X64_EXT = os.environ.get('X64_EXT',"x64")
libs = { 'zlib':{
'url':'http://zlib.net/zlib128.zip',
@ -121,7 +122,7 @@ def pyversion_fromEnv():
break
if '64' in py:
py_version = '%s-x64' % py_version
py_version = '%s%s' % (py_version, X64_EXT)
return py_version

View File

@ -31,7 +31,7 @@ if __name__=='__main__':
os.chdir('..')
pool = multiprocessing.Pool()
matrix = [(python, architecture) for python in pythons
for architecture in ('', 'x64')]
for architecture in ('', X64_EXT)]
results = pool.map(test_one, matrix)