mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
Merge branch 'api-tags' into 'master'
Bump release version for 2.62 series See merge request GNOME/glib!709
This commit is contained in:
Emmanuele Bassi
commit
7644b6a368
@ -118,67 +118,6 @@ if get_option('gtk_doc')
|
||||
]
|
||||
endif
|
||||
|
||||
ignore_decorators = [
|
||||
'GLIB_VAR',
|
||||
'G_GNUC_INTERNAL',
|
||||
'G_GNUC_WARN_UNUSED_RESULT',
|
||||
'GLIB_AVAILABLE_IN_ALL',
|
||||
'GLIB_AVAILABLE_IN_2_26',
|
||||
'GLIB_AVAILABLE_IN_2_28',
|
||||
'GLIB_AVAILABLE_IN_2_30',
|
||||
'GLIB_AVAILABLE_IN_2_32',
|
||||
'GLIB_AVAILABLE_IN_2_34',
|
||||
'GLIB_AVAILABLE_IN_2_36',
|
||||
'GLIB_AVAILABLE_IN_2_38',
|
||||
'GLIB_AVAILABLE_IN_2_40',
|
||||
'GLIB_AVAILABLE_IN_2_42',
|
||||
'GLIB_AVAILABLE_IN_2_44',
|
||||
'GLIB_AVAILABLE_IN_2_46',
|
||||
'GLIB_AVAILABLE_IN_2_48',
|
||||
'GLIB_AVAILABLE_IN_2_50',
|
||||
'GLIB_AVAILABLE_IN_2_52',
|
||||
'GLIB_AVAILABLE_IN_2_54',
|
||||
'GLIB_AVAILABLE_IN_2_56',
|
||||
'GLIB_AVAILABLE_IN_2_58',
|
||||
'GLIB_AVAILABLE_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_26',
|
||||
'GLIB_DEPRECATED_IN_2_26_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_28',
|
||||
'GLIB_DEPRECATED_IN_2_28_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_30',
|
||||
'GLIB_DEPRECATED_IN_2_30_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_32',
|
||||
'GLIB_DEPRECATED_IN_2_32_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_34',
|
||||
'GLIB_DEPRECATED_IN_2_34_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_36',
|
||||
'GLIB_DEPRECATED_IN_2_36_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_38',
|
||||
'GLIB_DEPRECATED_IN_2_38_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_40',
|
||||
'GLIB_DEPRECATED_IN_2_40_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_42',
|
||||
'GLIB_DEPRECATED_IN_2_42_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_44',
|
||||
'GLIB_DEPRECATED_IN_2_44_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_46',
|
||||
'GLIB_DEPRECATED_IN_2_46_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_48',
|
||||
'GLIB_DEPRECATED_IN_2_48_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_50',
|
||||
'GLIB_DEPRECATED_IN_2_50_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_52',
|
||||
'GLIB_DEPRECATED_IN_2_52_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_54',
|
||||
'GLIB_DEPRECATED_IN_2_54_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_56',
|
||||
'GLIB_DEPRECATED_IN_2_56_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_58',
|
||||
'GLIB_DEPRECATED_IN_2_58_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_60_FOR',
|
||||
]
|
||||
|
||||
# FIXME: More win32 headers were added to fix building gio-scan
|
||||
|
||||
# FIXME: ExampleAnimal docs aren't built
|
||||
@ -198,10 +137,8 @@ if get_option('gtk_doc')
|
||||
mode : 'none',
|
||||
dependencies : [libgio_dep, libgobject_dep, libglib_dep],
|
||||
src_dir : 'gio',
|
||||
scan_args : [
|
||||
scan_args : gtkdoc_common_scan_args + [
|
||||
'--rebuild-types',
|
||||
'--deprecated-guards=G_DISABLE_DEPRECATED',
|
||||
'--ignore-decorators=' + '|'.join(ignore_decorators),
|
||||
'--ignore-headers=' + ' '.join(ignore_headers),
|
||||
],
|
||||
content_files : [
|
||||
|
||||
@ -40,67 +40,6 @@ if get_option('gtk_doc')
|
||||
'gvalgrind.h',
|
||||
]
|
||||
|
||||
ignore_decorators = [
|
||||
'GLIB_VAR',
|
||||
'G_GNUC_INTERNAL',
|
||||
'G_GNUC_WARN_UNUSED_RESULT',
|
||||
'GLIB_AVAILABLE_IN_ALL',
|
||||
'GLIB_AVAILABLE_IN_2_26',
|
||||
'GLIB_AVAILABLE_IN_2_28',
|
||||
'GLIB_AVAILABLE_IN_2_30',
|
||||
'GLIB_AVAILABLE_IN_2_32',
|
||||
'GLIB_AVAILABLE_IN_2_34',
|
||||
'GLIB_AVAILABLE_IN_2_36',
|
||||
'GLIB_AVAILABLE_IN_2_38',
|
||||
'GLIB_AVAILABLE_IN_2_40',
|
||||
'GLIB_AVAILABLE_IN_2_42',
|
||||
'GLIB_AVAILABLE_IN_2_44',
|
||||
'GLIB_AVAILABLE_IN_2_46',
|
||||
'GLIB_AVAILABLE_IN_2_48',
|
||||
'GLIB_AVAILABLE_IN_2_50',
|
||||
'GLIB_AVAILABLE_IN_2_52',
|
||||
'GLIB_AVAILABLE_IN_2_54',
|
||||
'GLIB_AVAILABLE_IN_2_56',
|
||||
'GLIB_AVAILABLE_IN_2_58',
|
||||
'GLIB_AVAILABLE_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_26',
|
||||
'GLIB_DEPRECATED_IN_2_26_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_28',
|
||||
'GLIB_DEPRECATED_IN_2_28_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_30',
|
||||
'GLIB_DEPRECATED_IN_2_30_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_32',
|
||||
'GLIB_DEPRECATED_IN_2_32_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_34',
|
||||
'GLIB_DEPRECATED_IN_2_34_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_36',
|
||||
'GLIB_DEPRECATED_IN_2_36_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_38',
|
||||
'GLIB_DEPRECATED_IN_2_38_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_40',
|
||||
'GLIB_DEPRECATED_IN_2_40_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_42',
|
||||
'GLIB_DEPRECATED_IN_2_42_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_44',
|
||||
'GLIB_DEPRECATED_IN_2_44_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_46',
|
||||
'GLIB_DEPRECATED_IN_2_46_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_48',
|
||||
'GLIB_DEPRECATED_IN_2_48_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_50',
|
||||
'GLIB_DEPRECATED_IN_2_50_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_52',
|
||||
'GLIB_DEPRECATED_IN_2_52_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_54',
|
||||
'GLIB_DEPRECATED_IN_2_54_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_56',
|
||||
'GLIB_DEPRECATED_IN_2_56_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_58',
|
||||
'GLIB_DEPRECATED_IN_2_58_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_60_FOR',
|
||||
]
|
||||
|
||||
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')
|
||||
version_conf = configuration_data()
|
||||
version_conf.set('GLIB_VERSION', meson.project_version())
|
||||
@ -116,9 +55,7 @@ if get_option('gtk_doc')
|
||||
mode : 'none',
|
||||
src_dir : [ 'glib', 'gmodule' ],
|
||||
dependencies : libglib_dep,
|
||||
scan_args : [
|
||||
'--deprecated-guards=G_DISABLE_DEPRECATED',
|
||||
'--ignore-decorators=' + '|'.join(ignore_decorators),
|
||||
scan_args : gtkdoc_common_scan_args + [
|
||||
'--ignore-headers=' + ' '.join(ignore_headers),
|
||||
],
|
||||
content_files : [
|
||||
|
||||
@ -10,67 +10,6 @@ if get_option('gtk_doc')
|
||||
'glib-enumtypes.h',
|
||||
]
|
||||
|
||||
ignore_decorators = [
|
||||
'GLIB_VAR',
|
||||
'G_GNUC_INTERNAL',
|
||||
'G_GNUC_WARN_UNUSED_RESULT',
|
||||
'GLIB_AVAILABLE_IN_ALL',
|
||||
'GLIB_AVAILABLE_IN_2_26',
|
||||
'GLIB_AVAILABLE_IN_2_28',
|
||||
'GLIB_AVAILABLE_IN_2_30',
|
||||
'GLIB_AVAILABLE_IN_2_32',
|
||||
'GLIB_AVAILABLE_IN_2_34',
|
||||
'GLIB_AVAILABLE_IN_2_36',
|
||||
'GLIB_AVAILABLE_IN_2_38',
|
||||
'GLIB_AVAILABLE_IN_2_40',
|
||||
'GLIB_AVAILABLE_IN_2_42',
|
||||
'GLIB_AVAILABLE_IN_2_44',
|
||||
'GLIB_AVAILABLE_IN_2_46',
|
||||
'GLIB_AVAILABLE_IN_2_48',
|
||||
'GLIB_AVAILABLE_IN_2_50',
|
||||
'GLIB_AVAILABLE_IN_2_52',
|
||||
'GLIB_AVAILABLE_IN_2_54',
|
||||
'GLIB_AVAILABLE_IN_2_56',
|
||||
'GLIB_AVAILABLE_IN_2_58',
|
||||
'GLIB_AVAILABLE_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_26',
|
||||
'GLIB_DEPRECATED_IN_2_26_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_28',
|
||||
'GLIB_DEPRECATED_IN_2_28_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_30',
|
||||
'GLIB_DEPRECATED_IN_2_30_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_32',
|
||||
'GLIB_DEPRECATED_IN_2_32_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_34',
|
||||
'GLIB_DEPRECATED_IN_2_34_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_36',
|
||||
'GLIB_DEPRECATED_IN_2_36_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_38',
|
||||
'GLIB_DEPRECATED_IN_2_38_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_40',
|
||||
'GLIB_DEPRECATED_IN_2_40_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_42',
|
||||
'GLIB_DEPRECATED_IN_2_42_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_44',
|
||||
'GLIB_DEPRECATED_IN_2_44_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_46',
|
||||
'GLIB_DEPRECATED_IN_2_46_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_48',
|
||||
'GLIB_DEPRECATED_IN_2_48_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_50',
|
||||
'GLIB_DEPRECATED_IN_2_50_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_52',
|
||||
'GLIB_DEPRECATED_IN_2_52_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_54',
|
||||
'GLIB_DEPRECATED_IN_2_54_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_56',
|
||||
'GLIB_DEPRECATED_IN_2_56_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_58',
|
||||
'GLIB_DEPRECATED_IN_2_58_FOR',
|
||||
'GLIB_DEPRECATED_IN_2_60',
|
||||
'GLIB_DEPRECATED_IN_2_60_FOR',
|
||||
]
|
||||
|
||||
docpath = join_paths(glib_datadir, 'gtk-doc', 'html')
|
||||
version_conf = configuration_data()
|
||||
version_conf.set('GLIB_VERSION', meson.project_version())
|
||||
@ -89,10 +28,8 @@ if get_option('gtk_doc')
|
||||
dependencies : [libgobject_dep, libglib_dep],
|
||||
include_directories : [gtkdocincl],
|
||||
src_dir : 'gobject',
|
||||
scan_args : [
|
||||
scan_args : gtkdoc_common_scan_args + [
|
||||
'--rebuild-types',
|
||||
'--deprecated-guards=G_DISABLE_DEPRECATED',
|
||||
'--ignore-decorators=' + '|'.join(ignore_decorators),
|
||||
'--ignore-headers=' + ' '.join(ignore_headers),
|
||||
],
|
||||
content_files : [
|
||||
|
||||
35
docs/reference/meson.build
Normal file
35
docs/reference/meson.build
Normal file
@ -0,0 +1,35 @@
|
||||
# The list of minor versions in the 2.x.x series which have had
|
||||
# GLIB_AVAILABLE_IN_* macros. This should include the current unreleased stable
|
||||
# version.
|
||||
#
|
||||
# FIXME: It would be good to be able to generate this list:
|
||||
# https://github.com/mesonbuild/meson/issues/5026
|
||||
stable_2_series_versions = [
|
||||
'26', '28', '30', '32', '34', '36', '38',
|
||||
'40', '42', '44', '46', '48', '50', '52', '54', '56', '58',
|
||||
'60', '62',
|
||||
]
|
||||
|
||||
ignore_decorators = [
|
||||
'GLIB_VAR',
|
||||
'G_GNUC_INTERNAL',
|
||||
'G_GNUC_WARN_UNUSED_RESULT',
|
||||
'GLIB_AVAILABLE_IN_ALL',
|
||||
]
|
||||
|
||||
foreach version : stable_2_series_versions
|
||||
ignore_decorators += [
|
||||
'GLIB_AVAILABLE_IN_2_' + version,
|
||||
'GLIB_DEPRECATED_IN_2_' + version,
|
||||
'GLIB_DEPRECATED_IN_2_' + version + '_FOR',
|
||||
]
|
||||
endforeach
|
||||
|
||||
gtkdoc_common_scan_args = [
|
||||
'--deprecated-guards=G_DISABLE_DEPRECATED',
|
||||
'--ignore-decorators=' + '|'.join(ignore_decorators),
|
||||
]
|
||||
|
||||
subdir('gio')
|
||||
subdir('glib')
|
||||
subdir('gobject')
|
||||
@ -215,6 +215,16 @@
|
||||
*/
|
||||
#define GLIB_VERSION_2_60 (G_ENCODE_VERSION (2, 60))
|
||||
|
||||
/**
|
||||
* GLIB_VERSION_2_62:
|
||||
*
|
||||
* A macro that evaluates to the 2.62 version of GLib, in a format
|
||||
* that can be used by the C pre-processor.
|
||||
*
|
||||
* Since: 2.62
|
||||
*/
|
||||
#define GLIB_VERSION_2_62 (G_ENCODE_VERSION (2, 62))
|
||||
|
||||
/* evaluates to the current stable version; for development cycles,
|
||||
* this means the next stable target
|
||||
*/
|
||||
@ -558,4 +568,18 @@
|
||||
# define GLIB_AVAILABLE_IN_2_60 _GLIB_EXTERN
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_62
|
||||
# define GLIB_DEPRECATED_IN_2_62 GLIB_DEPRECATED
|
||||
# define GLIB_DEPRECATED_IN_2_62_FOR(f) GLIB_DEPRECATED_FOR(f)
|
||||
#else
|
||||
# define GLIB_DEPRECATED_IN_2_62 _GLIB_EXTERN
|
||||
# define GLIB_DEPRECATED_IN_2_62_FOR(f) _GLIB_EXTERN
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_62
|
||||
# define GLIB_AVAILABLE_IN_2_62 GLIB_UNAVAILABLE(2, 62)
|
||||
#else
|
||||
# define GLIB_AVAILABLE_IN_2_62 _GLIB_EXTERN
|
||||
#endif
|
||||
|
||||
#endif /* __G_VERSION_MACROS_H__ */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
project('glib', 'c', 'cpp',
|
||||
version : '2.60.0',
|
||||
version : '2.61.0',
|
||||
meson_version : '>= 0.48.0',
|
||||
default_options : [
|
||||
'buildtype=debugoptimized',
|
||||
@ -2045,6 +2045,4 @@ if get_option('man')
|
||||
endif
|
||||
|
||||
gnome = import('gnome')
|
||||
subdir('docs/reference/glib')
|
||||
subdir('docs/reference/gobject')
|
||||
subdir('docs/reference/gio')
|
||||
subdir('docs/reference')
|
||||
Loading…
Reference in New Issue
Block a user