diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-12-10 12:22:14 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-12-10 22:19:00 +0200 |
| commit | 5031f4981d4fcf6eb0bc950669a0a77a7df22939 (patch) | |
| tree | 0fcd3d994cca70fe7465b7732ebb516b7aa7e956 /mesonbuild/mdist.py | |
| parent | fc800a2cb8cb754e55db1b6ede287079d44dc244 (diff) | |
| download | meson-5031f4981d4fcf6eb0bc950669a0a77a7df22939.zip meson-5031f4981d4fcf6eb0bc950669a0a77a7df22939.tar.gz meson-5031f4981d4fcf6eb0bc950669a0a77a7df22939.tar.bz2 | |
dist: Fix --include-subprojects when .wrap file has directory value
Diffstat (limited to 'mesonbuild/mdist.py')
| -rw-r--r-- | mesonbuild/mdist.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index 5a61a6a..3cfb39a 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -24,6 +24,7 @@ from glob import glob from pathlib import Path from mesonbuild.environment import detect_ninja from mesonbuild.mesonlib import windows_proof_rmtree, MesonException +from mesonbuild.wrap import wrap from mesonbuild import mlog, build archive_choices = ['gztar', 'xztar', 'zip'] @@ -237,7 +238,10 @@ def run(options): subprojects = [] extra_meson_args = [] if options.include_subprojects: - subprojects = [os.path.join(b.subproject_dir, sub) for sub in b.subprojects] + subproject_dir = os.path.join(src_root, b.subproject_dir) + for sub in b.subprojects: + _, directory = wrap.get_directory(subproject_dir, sub) + subprojects.append(os.path.join(b.subproject_dir, directory)) extra_meson_args.append('-Dwrap_mode=nodownload') if is_git(src_root): |