Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix meson.build deprecations up to 0.56.0 (#119) #125

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Fix meson.build deprecations up to 0.56.0 (#119) #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installed-tests/js/libgjstesttools/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ libgjstesttools = library('gjstesttools',
gjstest_tools_gir = gnome.generate_gir(libgjstesttools,
includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources,
namespace: 'GjsTestTools', nsversion: '1.0',
symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error',
symbol_prefix: 'gjs_test_tools_', fatal_warnings: get_option('werror'),
install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
gjstest_tools_typelib = gjstest_tools_gir[1]
Expand Down
7 changes: 4 additions & 3 deletions installed-tests/js/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ libregress = library('regress', regress_sources,
regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
identifier_prefix: 'Regress', symbol_prefix: 'regress_',
extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
extra_args: ['--warn-all'] + regress_gir_c_args,
install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
install_dir_typelib: installed_tests_execdir,
fatal_warnings: get_option('werror'))
regress_typelib = regress_gir[1]

if not skip_warnlib
Expand Down Expand Up @@ -104,7 +105,7 @@ libgimarshallingtests = library('gimarshallingtests',
gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
namespace: 'GIMarshallingTests', nsversion: '1.0',
symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
symbol_prefix: 'gi_marshalling_tests_', fatal_warnings: get_option('werror'),
install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
gimarshallingtests_typelib = gimarshallingtests_gir[1]
Expand Down
4 changes: 2 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@
endif

# This dependency should provide everything that is needed to compile gjs except
# the sources themselves, is used to copmile both the static libraries and the

Check failure on line 540 in meson.build

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22 

copmile ==> compile
# tests
base_build_dep = declare_dependency(
compile_args: libgjs_cpp_args,
Expand Down Expand Up @@ -595,7 +595,7 @@
gjs_private_gir = gnome.generate_gir(libgjs,
includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
namespace: 'CjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
symbol_prefix: 'gjs_', fatal_warnings: get_option('werror'), install: true,
install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
gjs_private_typelib = gjs_private_gir[1]

Expand Down Expand Up @@ -642,7 +642,7 @@
libgjs_test_tools_builddir = js_tests_builddir / 'libgjstesttools'
# GJS_PATH is empty here since we want to force the use of our own
# resources. G_FILENAME_ENCODING ensures filenames are not UTF-8
tests_environment.set('TOP_BUILDDIR', meson.build_root())
tests_environment.set('TOP_BUILDDIR', meson.project_build_root())
tests_environment.set('GJS_USE_UNINSTALLED_FILES', '1')
tests_environment.set('GJS_PATH', '')
tests_environment.set('GJS_DEBUG_OUTPUT', 'stderr')
Expand Down
Loading