commit f97b6ca9c684bc7adf9b07043b62ecd7443272fc Author: Emmanuele Bassi Date: Sat Mar 18 13:22:25 2017 +0000 Release JSON-GLib 1.2.8 configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cef59a7c8ef4cc4d35e42cf0f3cbe7fd8217de62 Author: Emmanuele Bassi Date: Sat Mar 18 13:31:21 2017 +0000 Update the Git ignore file The `reference` path has been removed. .gitignore | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) commit 503b813696284fec0980d5f6d464008c574e487d Author: Emmanuele Bassi Date: Sat Mar 18 13:20:00 2017 +0000 doc: Update the README Replace the build instruction and dependencies to point at Meson instead of autotools. README.md | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) commit 016c93db6da096271ba19daad6ad10bd439f33d9 Author: Emmanuele Bassi Date: Tue Mar 14 14:33:40 2017 +0000 build: Sync the interface age with the version Like we do in the Meson build, the Autotools build should reset the interface age every time we do a development cycle. configure.ac | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit d1d2a978786437b411ea4fe66173236073527ab7 Author: Emmanuele Bassi Date: Sat Mar 18 13:34:42 2017 +0000 doc: Use 'plain' language for JSON snippets json-glib/json-path.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit ba663922b3d620b540c1d9436895e651190cb0b9 Author: Emmanuele Bassi Date: Tue Mar 14 11:15:39 2017 +0000 doc: Link the bug reporting URI in the API reference doc/json-glib-docs.xml | 5 +++++ 1 file changed, 5 insertions(+) commit b66aa29fd0e06a2ade0621ba997dff989af4fc4c Author: Emmanuele Bassi Date: Tue Mar 14 11:14:49 2017 +0000 Use the appropriate values to initialize Autotools The package name is "JSON-GLib"; the tarball name is "json-glib". The wiki page has also been moved. configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 66746cfa3de8cdb272c30da5c762735265e3b040 Author: Emmanuele Bassi Date: Tue Mar 14 10:58:33 2017 +0000 Move the reference build down one level There's no point in having the API reference in its own sub-directory: it's the only documentation we have. Makefile.am | 6 +-- configure.ac | 2 - doc/Makefile.am | 78 ++++++++++++++++++++++++--- doc/{reference => }/json-glib-docs.xml | 0 doc/{reference => }/json-glib-format.xml | 0 doc/{reference => }/json-glib-overrides.txt | 0 doc/{reference => }/json-glib-sections.txt | 0 doc/{reference => }/json-glib-validate.xml | 0 doc/{reference => }/meson.build | 0 doc/reference/Makefile.am | 78 --------------------------- doc/reference/version.xml.in | 1 - doc/{reference => }/xml/gtkdocentities.ent.in | 0 doc/{reference => }/xml/meson.build | 0 meson.build | 2 +- 14 files changed, 75 insertions(+), 92 deletions(-) commit 1447d8b527864c10899dab3733068407b82fb19b Author: Emmanuele Bassi Date: Tue Mar 14 10:48:55 2017 +0000 build: Fix soversion for Meson builds During stable cycles we want the interface age to match the micro version, as there are no symbol additions if the minor version is an even number. Conversely, we want the interface age to reset to 0, as there are no expectations of ABI compatibility for newly added symbols. The current check uses the micro version, instead of the odd version, which breaks the logic above. This ensures that the soname generated via the Meson build is the same as the one generated by the Autotools one. meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 82438b38ec955057b314126b5a7d044b2675a34d Author: Chun-wei Fan Date: Tue Mar 14 13:03:29 2017 +0800 Visual Studio builds: Copy config.h.win32 to $(srcroot)\json-glib This follows the autotools builds and Meson builds. build/win32/vs10/json-glib-gen-srcs.props | 2 +- build/win32/vs10/json-glib.vcxprojin | 4 ++-- build/win32/vs9/json-glib-gen-srcs.vsprops | 2 +- build/win32/vs9/json-glib.vcprojin | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) commit d0eee742ccdcf67bd72f7506069346dbf0556b9c Author: Emmanuele Bassi Date: Mon Mar 13 18:15:44 2017 +0000 build: Generate the config.h file under json-glib Ensure that autotools and Meson behave similarly. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a1e2f314de3d37b8c543e7402d55d3ab93097abe Author: Emmanuele Bassi Date: Mon Mar 13 18:12:38 2017 +0000 build: Ignore 'config.h' when building the API reference It's an internal header. doc/reference/Makefile.am | 1 + doc/reference/meson.build | 2 ++ 2 files changed, 3 insertions(+) commit 0273e08ed61d2d83fb0308be05583e9a2741adb2 Author: Emmanuele Bassi Date: Mon Mar 13 18:11:07 2017 +0000 docs: Override version macros We don't need to show what they evaluate to, given that the value changes with every release. .gitignore | 1 - doc/reference/json-glib-overrides.txt | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) commit 68fe01530aefc8c87e04d1e2fc35a64dd8df20a5 Author: Emmanuele Bassi Date: Mon Mar 13 18:07:11 2017 +0000 docs: Reference the JSON-GLib header The API reference should list the header that user code should include in order to use the API. doc/reference/json-glib-sections.txt | 2 ++ 1 file changed, 2 insertions(+) commit 7dad6e7473852b687e12e737874d532261dbc343 Author: Emmanuele Bassi Date: Mon Mar 13 18:06:14 2017 +0000 docs: Add links to online resources Link the built API reference on developer.gnome.org, and the JSON website. doc/reference/json-glib-docs.xml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) commit 690d98d870c7cbad68ec9f1143879ed35c0037a2 Author: Emmanuele Bassi Date: Mon Mar 13 17:50:59 2017 +0000 build: Really require the same pkg-config modules json-glib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 04a5298e6d9d862bed8567ac802f1aaa415f4ff4 Author: Emmanuele Bassi Date: Mon Mar 13 17:47:59 2017 +0000 build: Require the same modules for Meson and Autotools We depend on gio-2.0, which strings along glib-2.0 and gobject-2.0. json-glib/json-glib.pc.in | 2 +- json-glib/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f98d547d78ad294894cf8dfff5b0de1aa550bea7 Author: Emmanuele Bassi Date: Mon Mar 13 17:02:21 2017 +0000 Fix the generated pkg-config file with Meson We need to specify the sub-directory for the inclusion directive. json-glib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c1c04b0cfd3ebc8b4cf7299b6bf71a5149762330 Author: Emmanuele Bassi Date: Mon Mar 13 16:21:40 2017 +0000 build: Add missing argument to the introspection scanner The autotools build specifies the include header with the --c-include argument for g-ir-scanner, so we need to do the same when building with Meson. json-glib/meson.build | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) commit 4641cad9c3c9a26a1cb22d8517b971747b0271b6 Author: Emmanuele Bassi Date: Mon Mar 13 15:33:52 2017 +0000 Ensure that introspection scans all the headers We have a couple of generated header files, which means we need to list them as sources for the introspection scanner. json-glib/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit c623283f7177fd9d832de282aa38542642ce4082 Author: Emmanuele Bassi Date: Mon Mar 13 15:16:33 2017 +0000 build: Reduce the internal dependencies We don't need to make internal targets depend on generated sources, just on the generated header files. Depending on the generated sources will cause Meson to compile the generated sources once for each internal target. json-glib/meson.build | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit 1119bac133cd60552f661d2e2a5b21d2a8c80130 Author: Emmanuele Bassi Date: Mon Mar 13 15:08:40 2017 +0000 Add missing header in the Meson file listing The single include 'json-glib.h' header is missing. json-glib/meson.build | 1 + 1 file changed, 1 insertion(+) commit 3e28eebd47125fea6c749d9434ba1c638af53441 Author: Emmanuele Bassi Date: Mon Mar 13 15:03:19 2017 +0000 Remove dependency on json-version.h The file is generated at configuration time. json-glib/meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit db79241262c49a541e3eb06398c5d1f0d55f504c Author: Emmanuele Bassi Date: Mon Mar 13 14:55:03 2017 +0000 Post-release version bump to 1.2.7 configure.ac | 4 ++-- meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)