From e4f3894582e2bcd498b63c67fe953a392d6288d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 1 Mar 2019 13:27:00 +0100 Subject: [PATCH] dist: recurse into git submodules --- docs/markdown/Creating-releases.md | 3 ++- mesonbuild/scripts/dist.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/markdown/Creating-releases.md b/docs/markdown/Creating-releases.md index 0ec41d1c0..45c4b4ee2 100644 --- a/docs/markdown/Creating-releases.md +++ b/docs/markdown/Creating-releases.md @@ -17,7 +17,8 @@ single command: This creates a file called `projectname-version.tar.xz` in the build tree subdirectory `meson-dist`. This archive contains the full contents of the latest commit in revision control including all the -submodules. All revision control metadata is removed. Meson then takes +submodules (recursively). All revision control metadata is removed. +Meson then takes this archive and tests that it works by doing a full compile + test + install cycle. If all these pass, Meson will then create a SHA-256 checksum file next to the archive. diff --git a/mesonbuild/scripts/dist.py b/mesonbuild/scripts/dist.py index a8d9674b2..309a03291 100644 --- a/mesonbuild/scripts/dist.py +++ b/mesonbuild/scripts/dist.py @@ -62,7 +62,7 @@ def process_submodules(dirname): module_file = os.path.join(dirname, '.gitmodules') if not os.path.exists(module_file): return - subprocess.check_call(['git', 'submodule', 'update', '--init'], cwd=dirname) + subprocess.check_call(['git', 'submodule', 'update', '--init', '--recursive'], cwd=dirname) for line in open(module_file): line = line.strip() if '=' not in line: