Fix glib build when using MSI installer. Closes #3762.

pull/3809/head
Jussi Pakkanen 7 years ago
parent 32c22ec492
commit ce7cdadd37
  1. 6
      mesonbuild/mesonmain.py
  2. 1
      msi/createmsi.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__':

@ -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")

Loading…
Cancel
Save