aboutsummaryrefslogtreecommitdiff
path: root/msi
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-11-11 01:53:23 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-11-20 23:08:17 +0200
commit5d51bc79c7555e681a0c638da9528458257744ae (patch)
tree9d8e24be05870144a8763a094a8b273fd657c262 /msi
parentb3dfb80c15cae24c66d07425bb7a327528438a55 (diff)
downloadmeson-5d51bc79c7555e681a0c638da9528458257744ae.zip
meson-5d51bc79c7555e681a0c638da9528458257744ae.tar.gz
meson-5d51bc79c7555e681a0c638da9528458257744ae.tar.bz2
Replaced sys.executable use with the mesonlib equivalent.
Diffstat (limited to 'msi')
-rwxr-xr-xmsi/createmsi.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/msi/createmsi.py b/msi/createmsi.py
index 7f165d8..4f1fd5b 100755
--- a/msi/createmsi.py
+++ b/msi/createmsi.py
@@ -17,6 +17,7 @@
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())
@@ -82,9 +83,7 @@ class PackageGenerator:
modules = [os.path.splitext(os.path.split(x)[1])[0] for x in glob(os.path.join('mesonbuild/modules/*'))]
modules = ['mesonbuild.modules.' + x for x in modules if not x.startswith('_')]
modulestr = ','.join(modules)
- python = 'c:\\Python\python.exe'
- if sys.executable:
- python = sys.executable
+ python = shutil.which('python')
cxfreeze = os.path.join(os.path.dirname(python), "Scripts", "cxfreeze")
if not os.path.isfile(cxfreeze):
print("ERROR: This script requires cx_freeze module")