diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-23 23:45:09 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-26 23:01:52 +0300 |
| commit | ce7cdadd371b03401f2e81d299f0448955a950ef (patch) | |
| tree | 96e6dc61e192ae4ebfcd2e4c3700ba257de6c83f | |
| parent | 32c22ec492fb471dc0c1bfdbb83404a486e4a72a (diff) | |
| download | meson-ce7cdadd371b03401f2e81d299f0448955a950ef.zip meson-ce7cdadd371b03401f2e81d299f0448955a950ef.tar.gz meson-ce7cdadd371b03401f2e81d299f0448955a950ef.tar.bz2 | |
Fix glib build when using MSI installer. Closes #3762.
| -rw-r--r-- | mesonbuild/mesonmain.py | 6 | ||||
| -rwxr-xr-x | msi/createmsi.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index b70fd61..8a19631 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -359,7 +359,11 @@ def run(original_args, mainfile): def main(): # Always resolve the command path so Ninja can find it for regen, tests, etc. - launcher = os.path.realpath(sys.argv[0]) + if 'meson.exe' in sys.executable: + assert(os.path.isabs(sys.executable)) + launcher = sys.executable + else: + launcher = os.path.realpath(sys.argv[0]) return run(sys.argv[1:], launcher) if __name__ == '__main__': diff --git a/msi/createmsi.py b/msi/createmsi.py index 8a1bc5b..c48d0d8 100755 --- a/msi/createmsi.py +++ b/msi/createmsi.py @@ -85,6 +85,7 @@ class PackageGenerator: main_stage, ninja_stage = self.staging_dirs 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('_')] + modules += ['distutils.version'] modulestr = ','.join(modules) python = shutil.which('python') cxfreeze = os.path.join(os.path.dirname(python), "Scripts", "cxfreeze") |