From 5031f4981d4fcf6eb0bc950669a0a77a7df22939 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 10 Dec 2019 12:22:14 -0500 Subject: dist: Fix --include-subprojects when .wrap file has directory value --- mesonbuild/mdist.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesonbuild/mdist.py') 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): -- cgit v1.1