Remove unneded parameter wrapping in build script

This commit is contained in:
anatoly techtonik 2016-04-07 10:49:07 +03:00
parent e93cb41c1b
commit cc0c9b2b0d

View File

@ -23,8 +23,7 @@ def setup_vms():
return "\n".join(ret) return "\n".join(ret)
def run_script(params): def run_script(version, script):
(version, script) = params
try: try:
print("Running %s" % version) print("Running %s" % version)
filename = 'build_pillow_%s.cmd' % version filename = 'build_pillow_%s.cmd' % version
@ -99,7 +98,7 @@ def clean():
except: except:
# could already be removed # could already be removed
pass pass
run_script(('virtualenvs', setup_vms())) run_script('virtualenvs', setup_vms())
def main(op): def main(op):
@ -120,22 +119,21 @@ def main(op):
64)]), 64)]),
footer()]))) footer()])))
results = map(run_script, scripts) results = [run_script(pv, cv) for pv, cv in scripts]
for (version, status, trace, err) in results: for (version, status, trace, err) in results:
print("Compiled %s: %s" % (version, status and 'ERR' or 'OK')) print("Compiled %s: %s" % (version, status and 'ERR' or 'OK'))
def run_one(op): def run_one(op):
compiler = compiler_fromEnv() compiler = compiler_fromEnv()
py_version = pyversion_fromEnv() py_version = pyversion_fromEnv()
run_script((py_version, run_script(py_version,
"\n".join([header(op), "\n".join([header(op),
build_one(py_version, compiler), build_one(py_version, compiler),
footer()]) footer()])
)) )
if __name__ == '__main__': if __name__ == '__main__':
@ -146,7 +144,6 @@ if __name__ == '__main__':
op = 'install' op = 'install'
if '--dist' in args: if '--dist' in args:
op = "bdist_wininst --user-access-control=auto" op = "bdist_wininst --user-access-control=auto"
if 'PYTHON' in os.environ: if 'PYTHON' in os.environ:
run_one(op) run_one(op)
else: else: