aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <vladimir.cunat@nic.cz>2019-03-01 13:27:00 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-04-21 23:13:01 +0300
commite4f3894582e2bcd498b63c67fe953a392d6288d8 (patch)
treec6d3249312e035daa429b1934eb003790fea10fb
parent3edc7f343b938b9040c53004407f47f58fc15fcb (diff)
downloadmeson-e4f3894582e2bcd498b63c67fe953a392d6288d8.zip
meson-e4f3894582e2bcd498b63c67fe953a392d6288d8.tar.gz
meson-e4f3894582e2bcd498b63c67fe953a392d6288d8.tar.bz2
dist: recurse into git submodules
-rw-r--r--docs/markdown/Creating-releases.md3
-rw-r--r--mesonbuild/scripts/dist.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/markdown/Creating-releases.md b/docs/markdown/Creating-releases.md
index 0ec41d1..45c4b4e 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 a8d9674..309a032 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: