Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mesonintrospect: Normalize install_filename in the output 

Without this, we can output a mixture of '/' and '\' on platforms where
os.path.sep is '\' and prefix or outdir uses '/'. Let's always return
the path in the format of the platform we're running on.

This is needed to make the test_install_introspection() unittest work
properly on Windows.
This commit is contained in:
Nirbheek Chauhan 2017-02-05 05:18:08 +05:30
parent 8e36697617
commit b3d5db49e8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/mintro.py
View File

@ -23,6 +23,7 @@ import json, pickle
from . import coredata, build from . import coredata, build
import argparse import argparse
import sys, os import sys, os
import pathlib
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--targets', action='store_true', dest='list_targets', default=False, parser.add_argument('--targets', action='store_true', dest='list_targets', default=False,
@ -56,7 +57,9 @@ def determine_installed_path(target, installdata):
fname = i[0] fname = i[0]
outdir = i[1] outdir = i[1]
outname = os.path.join(installdata.prefix, outdir, os.path.split(fname)[-1]) outname = os.path.join(installdata.prefix, outdir, os.path.split(fname)[-1])
return outname # Normalize the path by using os.path.sep consistently, etc.
# Does not change the effective path.
return str(pathlib.PurePath(outname))
def list_installed(installdata): def list_installed(installdata):