Skip to content

Commit 02d036f

Browse files
committed
Upgrade meson to v1.8.2 and ninja to v1.13.0
1 parent deeac73 commit 02d036f

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

externals/meson

Submodule meson updated 2564 files

externals/ninja

Submodule ninja updated 148 files

meson_scripts/init.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def init_submodules(
5151
own_fado=True,
5252
own_mlpcpp=True,
5353
):
54-
5554
cur_dir = sys.path[0]
5655

5756
# This information of the modules is used if projects was not cloned using git
@@ -62,9 +61,9 @@ def init_submodules(
6261
github_repo_medi = "https://github.com/SciCompKL/MeDiPack"
6362
sha_version_opdi = "a5e2ac47035b6b3663f60d5f80b7a9fe62084867"
6463
github_repo_opdi = "https://github.com/SciCompKL/OpDiLib"
65-
sha_version_meson = "41c650a040d50e0912d268af7a903a9ce1456dfa"
64+
sha_version_meson = "5a82ea0501736a666ca9cc003ea0774f8219fd65"
6665
github_repo_meson = "https://github.com/mesonbuild/meson"
67-
sha_version_ninja = "52649de2c56b63f42bc59513d51286531c595b44"
66+
sha_version_ninja = "b4d51f6ed5bed09dd2b70324df0d9cb4ecad2638"
6867
github_repo_ninja = "https://github.com/ninja-build/ninja"
6968
sha_version_mpp = "5ff579f43781cae07411e5ab46291c9971536be6"
7069
github_repo_mpp = "https://github.com/mutationpp/Mutationpp"
@@ -195,7 +194,6 @@ def is_git_directory(path="."):
195194

196195
def submodule_status(path, sha_commit):
197196
if not os.path.exists(path + os.path.sep + sha_commit):
198-
199197
# Check the status of the submodule
200198
status = subprocess.run(
201199
["git", "submodule", "status", path],
@@ -252,7 +250,6 @@ def submodule_status(path, sha_commit):
252250

253251

254252
def download_module(name, alt_name, git_repo, commit_sha):
255-
256253
# ZipFile does not preserve file permissions.
257254
# This is a workaround for that problem:
258255
# https://stackoverflow.com/questions/39296101/python-zipfile-removes-execute-permissions-from-binaries
@@ -275,7 +272,6 @@ def _extract_member(self, member, targetpath, pwd):
275272
module_identifier = os.path.join(alt_name, commit_sha)
276273

277274
if not os.path.exists(module_identifier):
278-
279275
if os.path.exists(alt_name) and os.listdir(alt_name):
280276
print("Directory " + alt_name + " is not empty")
281277
print("Maybe submodules are already cloned with git?")

0 commit comments

Comments
 (0)