commit 02b3ee77a35624a3d6e478ae3700100cb24bf18f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 15 11:08:37 2011 +0100
Release JSON-GLib 0.13.4
NEWS | 6 ++++++
configure.ac | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
commit f37878ec1759283f78a6d580c1f78e9039717862
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 15 11:08:12 2011 +0100
docs: Fix API reference missing symbols
doc/reference/json-glib-sections.txt | 4 ++++
json-glib/json-gobject.h | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu Jun 9 17:23:04 2011 +0100
Remove G_CONST_RETURN usage
See GLib bug:
https://bugzilla.gnome.org/show_bug.cgi?id=644611
The macro is going to be deprecated soon.
json-glib/json-array.c | 2 +-
json-glib/json-node.c | 6 +++---
json-glib/json-object.c | 2 +-
json-glib/json-reader.c | 6 +++---
json-glib/json-reader.h | 6 +++---
json-glib/json-types-private.h | 2 +-
json-glib/json-types.h | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
commit 74bb5d61a737cceffd04c8d9ae8d5db390eda5a2
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jun 3 11:46:05 2011 +0100
Use the new atomic functions for refcounting
The newly added g_atomic_int_dec_and_test() simplified the logic for
unreffing Object and Array.
json-glib/json-array.c | 9 ++-------
json-glib/json-object.c | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
commit 4f83868e3a18adac809aff111c5df5ff7af8fedf
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri Jun 3 11:18:27 2011 +0100
build: Remove deprecation disabling for GLib
json-glib/Makefile.am | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit 65a95198a4a1bca7b418af1639c4bb24b09947c5
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Jun 3 15:32:55 2011 +0800
Visual C++ support: projects for JSONPath test
Added projects to build test program for JSONPath (path-test.c)
build/win32/vs10/Makefile.am | 2 +
build/win32/vs10/install.vcxproj | 8 ++
build/win32/vs10/json-glib.sln | 26 +++--
build/win32/vs10/path-test.vcxproj | 159 ++++++++++++++++++++++++++++
build/win32/vs10/path-test.vcxproj.filters | 14 +++
build/win32/vs9/Makefile.am | 1 +
build/win32/vs9/json-glib.sln | 30 ++++--
build/win32/vs9/path-test.vcproj | 147 +++++++++++++++++++++++++
8 files changed, 371 insertions(+), 16 deletions(-)
commit 16bc9cccd32f4e1c7e9fc0da128aef969d0563b0
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Jun 3 15:01:16 2011 +0800
Update config.h.win32.in
Added definition of GETTEXT_PACKAGE due to the addition of the i18n
machinery (commit 67edce08670ce1da4956f87948985434ac5ae2ca)
build/win32/config.h.win32.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit d93260c477930140f2ecf2927bd9f2a2d7f4f905
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri Jun 3 14:47:42 2011 +0800
Update VS property sheets
-Add json-path.h to the list of headers to be copied in the "install" stage
build/win32/vs10/json-glib.props | 2 ++
build/win32/vs9/json-glib.vsprops | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
commit c3b367ca8bac245712f8390acab1b38a314972a9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 17:10:17 2011 +0100
serializable: Fix introspection annotations
json-glib/json-serializable.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
commit aee5a7fbb70e5cb714bcfef79a96c000f62e80db
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 17:01:02 2011 +0100
Remove unused files
- AUTHORS
- MAINTAINER
replaced by json-glib.doap
- ChangeLog
empty, and not necessary with the foreign automake option
AUTHORS | 1 -
ChangeLog | 6 ------
MAINTAINERS | 3 ---
configure.ac | 5 +++--
4 files changed, 3 insertions(+), 12 deletions(-)
commit 1d4cdb76b6f97c723dd6e4c634bacc52d3199999
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 13:35:16 2011 +0100
Update the ignore file for the po directory
po/.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 8863766ca4792383dad0e48550f8fb79d4c104e4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 13:21:32 2011 +0100
Mark GError messages for translations
These errors might find their way into a UI.
json-glib/json-gobject.c | 4 ++--
json-glib/json-gvariant.c | 40 ++++++++++++++++++----------------------
json-glib/json-parser.c | 5 ++++-
json-glib/json-path.c | 13 +++++++------
json-glib/json-reader.c | 20 ++++++++++----------
5 files changed, 41 insertions(+), 41 deletions(-)
commit 67edce08670ce1da4956f87948985434ac5ae2ca
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 13:09:01 2011 +0100
Add i18n machinery
We need to translate the GError messages.
.gitignore | 2 ++
Makefile.am | 2 +-
build/autotools/Makefile.am | 1 +
build/autotools/as-linguas.m4 | 24 ++++++++++++++++++++++++
configure.ac | 12 ++++++++++++
json-glib/json-gobject.c | 2 ++
json-glib/json-gvariant.c | 6 ++++++
json-glib/json-parser.c | 2 ++
json-glib/json-path.c | 4 +++-
json-glib/json-reader.c | 2 ++
po/.gitignore | 13 +++++++++++++
po/Makevars | 7 +++++++
po/POTFILES.in | 6 ++++++
13 files changed, 81 insertions(+), 2 deletions(-)
commit e3b5883d4435da7fe677eb9a7c74d2f83980f5da
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 12:49:28 2011 +0100
gobject: Do not serialize default values
If a property is set to its default value then we can skip its
serialization, to keep the number of JSON object members down.
json-glib/json-gobject.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 8c424cc133575282371bff8d17295662267049e9
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 12:48:20 2011 +0100
tests/serialize-complex: Modify the instance
Do not test the defaults: create the GObject instance with different
values than the default ones from the GParamSpec.
json-glib/tests/serialize-complex.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
commit 96b1e6b50f355c04e794ad7366bd33b9c3d1f81b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 12:35:58 2011 +0100
serializable: Allow introspecting properties
This allows a Serializable implementation to override the property list,
and the setter and the getter function.
json-glib/json-gobject.c | 43 +++++++++++++++++-----
json-glib/json-gobject.h | 22 +++++++++++
json-glib/json-serializable.c | 81 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 9 deletions(-)
commit c85fc93f6235b8b9d584585215b2fa860f07f2c3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 12:36:08 2011 +0100
Revert "path: Add some more validation points"
This reverts commit e8fa85705e48d03742eb351addbad53be4d8e60b.
The validation broke the test suite; it'll need some more work.
json-glib/json-path.c | 77 +++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 56 deletions(-)
commit e8fa85705e48d03742eb351addbad53be4d8e60b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 07:55:17 2011 +0100
path: Add some more validation points
Especially for the slice syntax.
json-glib/json-path.c | 77 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 21 deletions(-)
commit 295c469329d040b4d311e9c295bec908856190d6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 07:54:48 2011 +0100
symbols: Add JsonPath public entry points
json-glib/json-glib.symbols | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 257209ab47ebcbf36006dd3aa3fcee5545381c6f
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed Jun 1 07:54:26 2011 +0100
docs: Document JsonPath and add it to the API reference
doc/reference/json-glib-docs.xml | 3 +-
doc/reference/json-glib-sections.txt | 20 ++++
doc/reference/json-glib.types | 1 +
json-glib/json-path.c | 174 +++++++++++++++++++++++++++++++++-
4 files changed, 195 insertions(+), 3 deletions(-)
commit ac89bb7fc7491019f8baa687a785eeb93af7213e
Merge: b5bd477 4ea8cd4
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue May 31 23:16:10 2011 +0100
Merge branch 'wip/json-path'
* wip/json-path:
Add initial JSONPath implementation
commit 4ea8cd43986d5888fb8e809a198d6b0331b12480
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat May 28 14:36:43 2011 +0100
Add initial JSONPath implementation
JSONPath is a JSON query syntax similar to what XPath does for XML;
using JSONPath it's possible to address a specific node (or set of
nodes) inside a JSON document.
The JsonPath class is a simple implementation of part of the JSONPath
proposal, as formalised by Stefan Gössner here:
http://goessner.net/articles/JsonPath/
The covered operators are:
• root, or '$';
• child, both using the dot-notation and the bracket notation;
• recursive descent, or '..';
• subscript, or '[]';
• set, or '[,]';
• slice, or '[start:end:step]'.
The only missing operators are the filter, or '?()' and the script,
or '()', because implementing a JavaScript interpreter inside JSON-GLib
is not one of my greatest aspirations. It should be possible, though,
to parse and evaluate simple arithmetic conditions, in the future.
The JsonPath methods are pretty straightforward: a JsonPath instance
should be created and used to compile an expression; the compilation
might result in a syntax error or not. Then, the JsonPath instance can
be used to match any JSON tree. Like the other JSONPath implementations,
JsonPath returns a JSON array of matching nodes.
A simple, one-off static method called json_path_query() is also
provided; the method wraps the JsonPath creation, the expression
compilation, and the matching, as well as disposing the JsonPath
instance once done.
For the time being, only positive testing is provided; negative testing
for the expression compilation will follow.
json-glib/Makefile.am | 2 +
json-glib/json-debug.c | 3 +-
json-glib/json-debug.h | 3 +-
json-glib/json-glib.h | 1 +
json-glib/json-path.c | 856 +++++++++++++++++++++++++++++++++++++++++++
json-glib/json-path.h | 97 +++++
json-glib/tests/Makefile.am | 1 +
json-glib/tests/path-test.c | 143 +++++++
8 files changed, 1104 insertions(+), 2 deletions(-)
commit b5bd47727c960990ba98902ee2d7099491a4178a
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 30 14:26:54 2011 +0800
Add/update Visual C++ projects for GVariant API
-Added/dist VS 2008/2010 projects to compile the gvariant-test test program
(yes, the gvariant-test program passes in the 32-bit and 64-bit modes)
-Updated property sheet to "install" the "new" json-gvariant.h
build/win32/vs10/Makefile.am | 2 +
build/win32/vs10/gvariant-test.vcxproj | 159 ++++++++++++++++++++++++
build/win32/vs10/gvariant-test.vcxproj.filters | 14 ++
build/win32/vs10/json-glib.props | 2 +
build/win32/vs10/json-glib.sln | 10 ++
build/win32/vs9/Makefile.am | 1 +
build/win32/vs9/gvariant-test.vcproj | 147 ++++++++++++++++++++++
build/win32/vs9/json-glib.sln | 14 ++
build/win32/vs9/json-glib.vsprops | 1 +
9 files changed, 350 insertions(+), 0 deletions(-)
commit 3a1d817fd39b4b4d2bdbc93257be535c5b29780f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 30 13:07:53 2011 +0800
Update json-glib.symbols
Added the JSON-GLib gvariant-related APIs.
json-glib/json-glib.symbols | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 1b7f20fe88a6647e61964db063eba071114a6f66
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 30 12:53:47 2011 +0800
Update $(srcroot)/Makefile.am
Due to changes to this file in commit
4e41d26586991d2977c846fa4871b6df39fe4106, change the order of SUBDIRS
so that "make dist" will properly run.
This has been checked with "make distcheck" on Fedora 15
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 54172e25e8b62075f0aef98d21e17619466ff30f
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 30 11:55:06 2011 +0800
Update Visual C++ Project Files
Update the dist part too...
build/win32/vs10/Makefile.am | 16 ++++++++--------
build/win32/vs9/Makefile.am | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
commit 0715050a5a76f187f66f14288a8f3444a4eb49e4
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 30 11:53:04 2011 +0800
Update VS 2008/2010 Project Files
Due to the changes in the location/names of some test programs in
commit 4e41d26586991d2977c846fa4871b6df39fe4106, update the VS
project files...
build/win32/vs10/boxed.vcxproj | 172 ++++++++++++++++++++
build/win32/vs10/boxed.vcxproj.filters | 14 ++
build/win32/vs10/install.vcxproj | 8 +-
build/win32/vs10/json-glib.sln | 8 +-
build/win32/vs10/serialize-complex.vcxproj | 171 +++++++++++++++++++
build/win32/vs10/serialize-complex.vcxproj.filters | 14 ++
build/win32/vs10/serialize-full.vcxproj | 172 ++++++++++++++++++++
build/win32/vs10/serialize-full.vcxproj.filters | 14 ++
build/win32/vs10/serialize-simple.vcxproj | 171 +++++++++++++++++++
build/win32/vs10/serialize-simple.vcxproj.filters | 14 ++
build/win32/vs10/test-serialize-boxed.vcxproj | 172 --------------------
.../vs10/test-serialize-boxed.vcxproj.filters | 14 --
build/win32/vs10/test-serialize-complex.vcxproj | 171 -------------------
.../vs10/test-serialize-complex.vcxproj.filters | 14 --
build/win32/vs10/test-serialize-full.vcxproj | 172 --------------------
.../win32/vs10/test-serialize-full.vcxproj.filters | 14 --
build/win32/vs10/test-serialize-simple.vcxproj | 171 -------------------
.../vs10/test-serialize-simple.vcxproj.filters | 14 --
build/win32/vs9/boxed.vcproj | 157 ++++++++++++++++++
build/win32/vs9/json-glib.sln | 8 +-
build/win32/vs9/serialize-complex.vcproj | 156 ++++++++++++++++++
build/win32/vs9/serialize-full.vcproj | 157 ++++++++++++++++++
build/win32/vs9/serialize-simple.vcproj | 156 ++++++++++++++++++
build/win32/vs9/test-serialize-boxed.vcproj | 157 ------------------
build/win32/vs9/test-serialize-complex.vcproj | 156 ------------------
build/win32/vs9/test-serialize-full.vcproj | 157 ------------------
build/win32/vs9/test-serialize-simple.vcproj | 156 ------------------
27 files changed, 1380 insertions(+), 1380 deletions(-)
commit 8b778252358ddb28936c6c9192a84f76368ca122
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat May 28 11:38:18 2011 +0100
tests: Fix up the JsonBuilder test
Clean up some odd code, and add a unit for the empty object case outlined
in bug 651271.
json-glib/tests/builder-test.c | 52 +++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 6 deletions(-)
commit d784cc6825607c517d7565049108d1f908a1d71b
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat May 28 11:36:55 2011 +0100
builder: Initialize state fields
If we're calling g_free() on a field we better make sure that it's either
NULL or contains valid data.
https://bugzilla.gnome.org/show_bug.cgi?id=651271
json-glib/json-builder.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit e20a8b0faeb45d1ae2f1bd12d49d31d12e357b24
Author: Alexandre Mazari <scaroo@gmail.com>
Date: Tue Mar 22 17:28:55 2011 +0100
gvariant: Fix introspection annotation
The 'signature' arguments of the json_gvariant_deserialize functions are
optional.
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
json-glib/json-gvariant.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 4e41d26586991d2977c846fa4871b6df39fe4106
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Sat May 28 11:05:57 2011 +0100
tests: Move all tests under json-glib
The test framework should live under the json-glib directory, and not be
spread across the project.
Makefile.am | 6 -
configure.ac | 2 -
json-glib/tests/Makefile.am | 53 ++---
json-glib/tests/boxed.c | 264 +++++++++++++++++++++++
json-glib/tests/serialize-complex.c | 293 +++++++++++++++++++++++++
json-glib/tests/serialize-full.c | 402 +++++++++++++++++++++++++++++++++++
json-glib/tests/serialize-simple.c | 166 ++++++++++++++
tests/Makefile.am | 34 ---
tests/test-serialize-boxed.c | 264 -----------------------
tests/test-serialize-complex.c | 293 -------------------------
tests/test-serialize-full.c | 402 -----------------------------------
tests/test-serialize-simple.c | 166 --------------
12 files changed, 1142 insertions(+), 1203 deletions(-)
commit 8d98b99b945423085232d358492e97399c9fd071
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon May 23 09:39:20 2011 +0800
Update Visual Studio property sheets
-Make DLL/LIB versioning more like the autotools-compiled versions
-"Install" the headers in a more consistent way like the autotools versions
build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
2 files changed, 29 insertions(+), 29 deletions(-)
commit 15221448b5998a071b72299c666044dd65ea97e3
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu May 19 08:32:03 2011 +0100
Add ignore file under build/win32
build/win32/.gitignore | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit f4651885961bf3ccc8d475cdc86af051fe1101f6
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed May 18 13:44:07 2011 +0100
doap: Add the download-page resource
json-glib.doap | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 8ef7da62a7575ebb04c69b9d98fd24efb840ab3b
Author: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Wed May 18 13:39:38 2011 +0100
Post-release version bump to 0.13.3
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)