diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-11-30 16:19:25 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-12-06 20:59:45 -0500 |
| commit | bc8c938148a55910dd1bd454fc3c5e8ab7477baa (patch) | |
| tree | 615e23242656d5baaa1ec5e1177c84b0e7922bb6 /test cases/frameworks | |
| parent | bed55a902c46ad0fb1330a19daaa9834a37d3336 (diff) | |
| download | meson-bc8c938148a55910dd1bd454fc3c5e8ab7477baa.zip meson-bc8c938148a55910dd1bd454fc3c5e8ab7477baa.tar.gz meson-bc8c938148a55910dd1bd454fc3c5e8ab7477baa.tar.bz2 | |
gnome module: deprecate passing false to install_dir_gir
Use a proper install option for this. Now `install_<type>` can directly
override `install` instead of passing a boolean to the string kwarg
`install_dir_<type>`.
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/12 multiple gir/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/mesongir/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/12 multiple gir/test.json | 11 |
3 files changed, 11 insertions, 5 deletions
diff --git a/test cases/frameworks/12 multiple gir/meson.build b/test cases/frameworks/12 multiple gir/meson.build index ddc9830..6391937 100644 --- a/test cases/frameworks/12 multiple gir/meson.build +++ b/test cases/frameworks/12 multiple gir/meson.build @@ -1,4 +1,4 @@ -project('multiple-gobject-introspection', 'c') +project('multiple-gobject-introspection', 'c', meson_version: '>=0.50.0') gir = find_program('g-ir-scanner', required: false) if not gir.found() diff --git a/test cases/frameworks/12 multiple gir/mesongir/meson.build b/test cases/frameworks/12 multiple gir/mesongir/meson.build index 3ca4333..1ae3f03 100644 --- a/test cases/frameworks/12 multiple gir/mesongir/meson.build +++ b/test cases/frameworks/12 multiple gir/mesongir/meson.build @@ -24,7 +24,8 @@ girtarget = gnome.generate_gir( identifier_prefix : 'Meson', includes : ['GObject-2.0'], export_packages : 'meson', - install : true + install : true, + install_gir: false, ) meson_gir = girtarget[0] meson_typelib = girtarget[1] diff --git a/test cases/frameworks/12 multiple gir/test.json b/test cases/frameworks/12 multiple gir/test.json index 9774402..e59c3e6 100644 --- a/test cases/frameworks/12 multiple gir/test.json +++ b/test cases/frameworks/12 multiple gir/test.json @@ -5,8 +5,13 @@ {"type": "expr", "file": "usr/lib/?libgirlib.so"}, {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirlib.dll.a"}, {"type": "expr", "file": "usr/lib/?libgirsubproject.so"}, - {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirsubproject.dll.a"}, - {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"} + {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirsubproject.dll.a"} ], - "skip_on_jobname": ["azure", "macos", "msys2"] + "skip_on_jobname": ["azure", "macos", "msys2"], + "stdout": [ + { + "comment": "This will either match in the future-deprecated notice summary, or match the warning summary", + "line": " * 0.61.0: {'\"gnome.generate_gir\" keyword argument \"install_dir_gir\" value \"False\"'}" + } + ] } |