kou commented on code in PR #1152:
URL: https://github.com/apache/arrow-adbc/pull/1152#discussion_r1343358437
##########
glib/adbc-glib/meson.build:
##########
@@ -86,7 +86,20 @@ pkgconfig.generate(libadbc_glib,
variables: pkgconfig_variables,
version: meson.project_version())
-adbc_glib_gir = gnome.generate_gir(libadbc_glib,
+
+gi_fatal_warnings = (build_machine.system() != 'windows')
Review Comment:
We don't need this because `glib/meson.build` already has it.
##########
glib/adbc-glib/meson.build:
##########
@@ -86,7 +86,20 @@ pkgconfig.generate(libadbc_glib,
variables: pkgconfig_variables,
version: meson.project_version())
-adbc_glib_gir = gnome.generate_gir(libadbc_glib,
+
+gi_fatal_warnings = (build_machine.system() != 'windows')
+have_gi = dependency('gobject-introspection-1.0', required: false).found()
+if have_gi
+ pkgconfig_variables += ['girdir=@0@'.format(gir_dir)]
Review Comment:
We already have this in `glib/meson.build`.
##########
glib/adbc-glib/meson.build:
##########
@@ -86,7 +86,20 @@ pkgconfig.generate(libadbc_glib,
variables: pkgconfig_variables,
version: meson.project_version())
-adbc_glib_gir = gnome.generate_gir(libadbc_glib,
+
+gi_fatal_warnings = (build_machine.system() != 'windows')
+have_gi = dependency('gobject-introspection-1.0', required: false).found()
Review Comment:
We can always require `gobject-introspection-1.0`.
##########
glib/adbc-glib/meson.build:
##########
@@ -86,7 +86,20 @@ pkgconfig.generate(libadbc_glib,
variables: pkgconfig_variables,
version: meson.project_version())
-adbc_glib_gir = gnome.generate_gir(libadbc_glib,
+
+gi_fatal_warnings = (build_machine.system() != 'windows')
+have_gi = dependency('gobject-introspection-1.0', required: false).found()
+if have_gi
+ pkgconfig_variables += ['girdir=@0@'.format(gir_dir)]
+endif
+generate_vapi = have_gi and get_option('vapi')
+if generate_vapi
+ pkgconfig_variables += ['vapidir=@0@'.format(vapi_dir)]
+ add_languages('vala')
+endif
Review Comment:
Could you do this in `glib/meson.build`?
##########
glib/meson_options.txt:
##########
@@ -21,3 +21,9 @@ option('adbc_build_dir',
type: 'string',
value: '',
description: 'Use this option to build with not installed ADBC')
+
Review Comment:
```suggestion
```
##########
glib/adbc-glib/meson.build:
##########
@@ -102,3 +115,10 @@ adbc_glib_gir = gnome.generate_gir(libadbc_glib,
nsversion: api_version,
sources: sources + definition_headers +
enums,
symbol_prefix: 'gadbc')
+ if generate_vapi
+ adbc_glib_vapi = gnome.generate_vapi('adbc-glib',
+ install: true,
+ packages: ['gio-2.0'],
Review Comment:
We don't need `gio-2.0`. We just need `gobject-2.0`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
