Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable runcmd to use a list for the command, and have it quote elements as needed.

Browse Source
This commit is contained in:
Robin Dunn
2016-07-22 14:41:14 -07:00
parent 648e5789fc
commit 09d4d817e6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@@ -232,8 +232,7 @@ def setPythonVersion(args):
PYTHON = args[idx+1]
del args[idx:idx+2]
PYVER = runcmd([PYTHON, '-c', 'import sys; print(sys.version[:3])'],
getOutput=True, echoCmd=True)
msg("PYVER: {!r}".format(PYVER))
getOutput=True, echoCmd=False)
PYSHORTVER = PYVER[0] + PYVER[2]
break
@@ -283,7 +282,7 @@ def setPythonVersion(args):
PYSHORTVER = PYVER[0] + PYVER[2]
PYTHON = os.path.abspath(PYTHON)
msg('Build using: "%s"' % PYTHON)
msg('Will build using: "%s"' % PYTHON)
msg(runcmd([PYTHON, '-c', 'import sys; print(sys.version)'], True, False))
PYTHON_ARCH = runcmd(

6
buildtools/config.py
View File

@@ -788,16 +788,14 @@ def runcmd(cmd, getOutput=False, echoCmd=True, fatal=True):
# add quotes to elements of the command that need it
cmd = cmd[:]
for idx, item in enumerate(cmd):
if ' ' in item or ';' in item:
if ' ' in item or '\t' in item or ';' in item:
if item[0] not in ['"', "'"]:
if '"' in item:
item = item.replace('"', '\\"')
item = '"{}"'.format(item)
cmd[idx] = item
# convert the resulting command to a string
cmd = ' '.join(cmd)
#if echoCmd:
# msg(' '.join(cmd))
if echoCmd:
msg(cmd)