Review fixes.

mesonbuild/backend/vs2010backend.py

@@ -23,7 +23,7 @@ from .. import dependencies
 from .. import mlog
 from .. import compilers
 from ..compilers import CompilerArgs
-from ..mesonlib import MesonException, File
+from ..mesonlib import MesonException, File, python_command
 from ..environment import Environment
 
 def autodetect_vs_version(build):
@@ -396,7 +396,7 @@ class Vs2010Backend(backends.Backend):
         action = ET.SubElement(root, 'ItemDefinitionGroup')
         customstep = ET.SubElement(action, 'PostBuildEvent')
         cmd_raw = [target.command] + target.args
-        cmd = mesonlib.python_command +
+        cmd = python_command + \
             [os.path.join(self.environment.get_script_dir(), 'commandrunner.py'),
              self.environment.get_build_dir(),
              self.environment.get_source_dir(),

mesonbuild/backend/xcodebackend.py

@@ -567,7 +567,7 @@ class XCodeBackend(backends.Backend):
         self.write_line('shellPath = /bin/sh;')
         script_root = self.environment.get_script_dir()
         test_script = os.path.join(script_root, 'meson_test.py')
-        cmd = mesonlib.python_command[test_script, test_data, '--wd', self.environment.get_build_dir()]
+        cmd = mesonlib.python_command + [test_script, test_data, '--wd', self.environment.get_build_dir()]
         cmdstr = ' '.join(["'%s'" % i for i in cmd])
         self.write_line('shellScript = "%s";' % cmdstr)
         self.write_line('showEnvVarsInLog = 0;')

mesonbuild/environment.py

@@ -327,7 +327,7 @@ class Environment:
     def get_build_command(self, unbuffered=False):
         cmd = mesonlib.meson_command[:]
         if unbuffered and 'python' in cmd[0]:
-            cmd = [cmd[0],'-u'] + cmd[1:]
+            cmd.insert(1, '-u')
         return cmd
 
     def is_header(self, fname):

mesonbuild/mesonlib.py

@@ -22,12 +22,12 @@ import collections
 
 from glob import glob
 
-if sys.executable.endswith('meson.exe'):
+if os.path.basename(sys.executable) == 'meson.exe':
     # In Windows and using the MSI installed executable.
     meson_command = [sys.executable]
     python_command = [sys.executable, 'runpython']
 else:
-    meson_command = [sys.executable, os.path.join(os.path.split(__file__)[0], '..', 'meson.py')]
+    meson_command = [sys.executable, os.path.join(os.path.dirname(__file__), '..', 'meson.py')]
     python_command = [sys.executable]
 
 

mesonbuild/scripts/regen_checker.py

@@ -14,6 +14,7 @@
 
 import sys, os
 import pickle, subprocess
+from mesonbuild.mesonlib import meson_command
 
 # This could also be used for XCode.
 
@@ -32,11 +33,11 @@ def need_regen(regeninfo, regen_timestamp):
     return False
 
 def regen(regeninfo, mesonscript, backend):
-    cmd = mesonlib.meson_command + ['--internal',
-                                    'regenerate',
-                                    regeninfo.build_dir,
-                                    regeninfo.source_dir,
-                                    '--backend=' + backend]
+    cmd = meson_command + ['--internal',
+                           'regenerate',
+                           regeninfo.build_dir,
+                           regeninfo.source_dir,
+                           '--backend=' + backend]
     subprocess.check_call(cmd)
 
 def run(args):

msi/createmsi.py

@@ -17,7 +17,6 @@
 import sys, os, subprocess, shutil, uuid
 from glob import glob
 import platform
-import shutil
 import xml.etree.ElementTree as ET
 
 sys.path.append(os.getcwd())