Skip to content

Commit

Permalink
Fix glib build when using MSI installer. Closes mesonbuild#3762.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Jun 26, 2018
1 parent 32c22ec commit ce7cdad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion mesonbuild/mesonmain.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
1 change: 1 addition & 0 deletions msi/createmsi.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ def build_dist(self):
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")
Expand Down

0 comments on commit ce7cdad

Please sign in to comment.