diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 11:53:54 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 11:53:54 +0200 |
commit | f3a8d231863319ba8b221ca471175a040afef64b (patch) | |
tree | 4216b7455f0c53a21dfe54d18887bff4965754d1 /util/build_scripts/generate-binding.py | |
parent | 727241758e46b14cda6940e62651674d8748dc3f (diff) | |
download | mm-common-f3a8d231863319ba8b221ca471175a040afef64b.tar.gz |
Subprojects can use meson.add_dist_script() if meson.version() >= 0.58.0
* meson.build:
* skeletonmm/doc/reference/meson.build:
* skeletonmm/meson.build:
* skeletonmm/skeleton/skeletonmm/meson.build:
Call add_dist_script() in a subproject, if meson.version() >= 0.58.0.
* util/build_scripts/dist-build-scripts.py:
* util/build_scripts/dist-changelog.py:
* util/build_scripts/doc-reference.py:
* util/build_scripts/generate-binding.py:
* util/meson_aux/extra-dist-cmd.py:
Use MESON_PROJECT_DIST_ROOT if it exists, else MESON_DIST_ROOT.
It exists if meson.version() >= 0.58.0.
Diffstat (limited to 'util/build_scripts/generate-binding.py')
-rwxr-xr-x | util/build_scripts/generate-binding.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/build_scripts/generate-binding.py b/util/build_scripts/generate-binding.py index c88bc5c..6d719ff 100755 --- a/util/build_scripts/generate-binding.py +++ b/util/build_scripts/generate-binding.py @@ -117,9 +117,12 @@ def dist_built_files(): # <built_h_cc_dir> <dist_dir> <basefilenames>... # <built_h_cc_dir> is an absolute path in the build directory or source directory. - # <dist_dir> is a distribution directory, relative to MESON_DIST_ROOT. + # <dist_dir> is a distribution directory, relative to MESON_PROJECT_DIST_ROOT. + + # MESON_PROJECT_DIST_ROOT is set only if meson.version() >= 0.58.0. + project_dist_root = os.getenv('MESON_PROJECT_DIST_ROOT', os.getenv('MESON_DIST_ROOT')) built_h_cc_dir = sys.argv[2] - dist_dir = os.path.join(os.getenv('MESON_DIST_ROOT'), sys.argv[3]) + dist_dir = os.path.join(project_dist_root, sys.argv[3]) # Create the distribution directory, if it does not exist. os.makedirs(os.path.join(dist_dir, 'private'), exist_ok=True) |