luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-21 17:37:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'api-tags' into 'master'

Browse Source 
Bump release version for 2.62 series

See merge request GNOME/glib!709
This commit is contained in:
Emmanuele Bassi
2019-03-06 12:30:12 +00:00
parent a73c9411f9 6761bb2f57
commit 7644b6a368
6 changed files with 64 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
docs/reference/gio/meson.build
View File

@@ -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 : [

65
docs/reference/glib/meson.build
View File

@@ -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 : [

65
docs/reference/gobject/meson.build
View File

@@ -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
View 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')