gplugin/gplugin

Use Meson's project version setting.
feature/meson
2017-06-01, Elliott Sales de Andrade
51520f2f3ffc
Parents 764116a5c6aa
Children bc51c1a190ab
Use Meson's project version setting.

It should carry over to dist building as well.
3 files changed, 17 insertions(+), 17 deletions(-)
  • +1 -1
    gplugin-gtk/meson.build
  • +1 -1
    gplugin/meson.build
  • +15 -15
    meson.build
    • --- a/gplugin-gtk/meson.build Thu Jun 01 22:49:25 2017 -0400
    +++ b/gplugin-gtk/meson.build Thu Jun 01 23:03:40 2017 -0400
    @@ -90,7 +90,7 @@
    pkgconfig.generate(
    name : 'libgplugin-gtk',
    description : 'Gtk+ widgets for GPlugin',
    - version : GPLUGIN_VERSION,
    + version : meson.project_version(),
    filebase : 'gplugin-gtk',
    subdirs : 'gplugin-1.0',
    libraries : gplugin_gtk,
    --- a/gplugin/meson.build Thu Jun 01 22:49:25 2017 -0400
    +++ b/gplugin/meson.build Thu Jun 01 23:03:40 2017 -0400
    @@ -197,7 +197,7 @@
    pkgconfig.generate(
    name : 'libgplugin',
    description : 'A fully featured GModule based plugin library',
    - version : GPLUGIN_VERSION,
    + version : meson.project_version(),
    filebase : 'gplugin',
    subdirs : 'gplugin-1.0',
    libraries : gplugin,
    --- a/meson.build Thu Jun 01 22:49:25 2017 -0400
    +++ b/meson.build Thu Jun 01 23:03:40 2017 -0400
    @@ -1,26 +1,26 @@
    ###############################################################################
    # Project Info
    ###############################################################################
    -project('gplugin', 'c', meson_version : '>0.36.0',
    - default_options : ['c_std=c99'])
    +project('gplugin', 'c', version : '0.28.0-dev',
    + meson_version : '>0.36.0',
    + default_options : ['c_std=c99'])
    -GPLUGIN_MAJOR_VERSION = 0
    -GPLUGIN_MINOR_VERSION = 28
    -GPLUGIN_MICRO_VERSION = 0
    -GPLUGIN_EXTRA_VERSION = 'dev'
    +parts = meson.project_version().split('-')
    +if parts.length() > 1
    + extra = parts[1]
    +else
    + extra = ''
    +endif
    -GPLUGIN_VERSION = '@0@.@1@.@2@@3@'.format(
    - GPLUGIN_MAJOR_VERSION,
    - GPLUGIN_MINOR_VERSION,
    - GPLUGIN_MICRO_VERSION,
    - GPLUGIN_EXTRA_VERSION)
    +parts = parts[0].split('.')
    +GPLUGIN_MAJOR_VERSION = parts[0]
    version_conf = configuration_data()
    version_conf.set('GPLUGIN_MAJOR_VERSION', GPLUGIN_MAJOR_VERSION)
    -version_conf.set('GPLUGIN_MINOR_VERSION', GPLUGIN_MINOR_VERSION)
    -version_conf.set('GPLUGIN_MICRO_VERSION', GPLUGIN_MICRO_VERSION)
    -version_conf.set('GPLUGIN_EXTRA_VERSION', GPLUGIN_EXTRA_VERSION)
    -version_conf.set('GPLUGIN_VERSION', GPLUGIN_VERSION)
    +version_conf.set('GPLUGIN_MINOR_VERSION', parts[1])
    +version_conf.set('GPLUGIN_MICRO_VERSION', parts[2])
    +version_conf.set('GPLUGIN_EXTRA_VERSION', extra)
    +version_conf.set('GPLUGIN_VERSION', meson.project_version())
    LOCALE_DIR = get_option('prefix') + '/locale'
    add_global_arguments('-DLOCALEDIR="@0@"'.format(LOCALE_DIR), language : 'c')