]>
granicus.if.org Git - json-c/log
Eric Haszlakiewicz [Sun, 24 Nov 2019 04:55:04 +0000 (23:55 -0500)]
Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient.
Eric Haszlakiewicz [Sun, 24 Nov 2019 04:14:24 +0000 (23:14 -0500)]
Fix up the test_util_file test for builds on Windows VS2015.
Eric Haszlakiewicz [Sun, 24 Nov 2019 01:31:14 +0000 (20:31 -0500)]
Fix some Windows compile issues, add JSON_EXPORT's, fix bogus character escapes, define __func__ and omit unistd.h if needed.
Eric Haszlakiewicz [Sat, 23 Nov 2019 20:34:23 +0000 (15:34 -0500)]
Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc.
Eric Haszlakiewicz [Sat, 23 Nov 2019 20:15:48 +0000 (15:15 -0500)]
Build and run the tests as part of the cmake build.
Eric Haszlakiewicz [Sat, 23 Nov 2019 17:05:28 +0000 (12:05 -0500)]
Fix memory leaks in test_double_serializer, and make sure all tests return 0 at the end of main().
Eric Haszlakiewicz [Sat, 23 Nov 2019 17:03:27 +0000 (12:03 -0500)]
Add a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests.
Eric Haszlakiewicz [Sat, 23 Nov 2019 03:56:33 +0000 (22:56 -0500)]
Extend test_double_serializer to check NaN and Infinity handling.
Eric Haszlakiewicz [Mon, 11 Nov 2019 01:35:30 +0000 (20:35 -0500)]
Define vars earlier to fix old Windows builds.
Eric Haszlakiewicz [Sun, 10 Nov 2019 05:12:27 +0000 (00:12 -0500)]
Add a json_object_from_fd_ex() function, to allow the max nesting depth to be specified.
Eric Haszlakiewicz [Sun, 10 Nov 2019 05:10:28 +0000 (00:10 -0500)]
Add a test for serializing the double value -1.0.
Eric Haszlakiewicz [Fri, 27 Sep 2019 02:23:52 +0000 (22:23 -0400)]
Merge pull request #505 from grdowns/vcpkg-instructions
Add vcpkg installation instructions
grdowns [Fri, 27 Sep 2019 00:11:49 +0000 (17:11 -0700)]
Update dependencies
grdowns [Fri, 27 Sep 2019 00:09:39 +0000 (17:09 -0700)]
Add vcpkg installation instructions
Eric Haszlakiewicz [Mon, 9 Sep 2019 02:42:36 +0000 (22:42 -0400)]
Issue #488: use JSON_EXPORT on functions so they are properly exported on Windows.
Eric Haszlakiewicz [Mon, 9 Sep 2019 02:27:30 +0000 (22:27 -0400)]
Issue #463: fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment.
The second call to newlocale() with LC_TIME accidentally made things
work because LC_TIME == LC_NUMERIC_MASK on some platforms.
Eric Haszlakiewicz [Mon, 9 Sep 2019 01:35:37 +0000 (21:35 -0400)]
Add a json_tokener_get_parse_end() function to replace direct access of tok->char_offset.
Eric Haszlakiewicz [Mon, 9 Sep 2019 01:34:13 +0000 (21:34 -0400)]
Minor cleanup of includes in a couple of tests.
Eric Haszlakiewicz [Mon, 12 Aug 2019 00:30:45 +0000 (00:30 +0000)]
Add an explicit cast to double to squash a -Wimplicit-int-float-conversion warning.
Though we will no longer be comparing exactly against INT64_MAX, this is ok
because any value of that magnitude stored in a double will *also* have been
rounded up, so the comparison will work appropriately.
Eric Haszlakiewicz [Sat, 27 Jul 2019 13:29:57 +0000 (09:29 -0400)]
Merge pull request #499 from andy5995/travis_valgrind
.travis.yml:test on more recent clang and gcc versions
andy5995 [Sat, 27 Jul 2019 04:51:18 +0000 (23:51 -0500)]
add xenial default clang with CHECK enabled
andy5995 [Sat, 27 Jul 2019 04:36:01 +0000 (23:36 -0500)]
add missing dist
andy5995 [Sat, 27 Jul 2019 04:15:06 +0000 (23:15 -0500)]
manually use apt-get to install packages on bionic
andy5995 [Sat, 27 Jul 2019 03:42:53 +0000 (22:42 -0500)]
add tests on bionic beaver
andy5995 [Fri, 26 Jul 2019 04:16:09 +0000 (23:16 -0500)]
revert toolchain back to "test"
andy5995 [Fri, 26 Jul 2019 04:10:14 +0000 (23:10 -0500)]
change key
andy5995 [Fri, 26 Jul 2019 04:00:50 +0000 (23:00 -0500)]
use "non-test" ppa
Maybe something weird about how gcc is configured with the test
toolchain?
andy5995 [Thu, 25 Jul 2019 19:11:31 +0000 (14:11 -0500)]
remove useless condition that shows logs
andy5995 [Wed, 24 Jul 2019 19:20:07 +0000 (14:20 -0500)]
install doxygen so 'make distcheck' can succeed
andy5995 [Wed, 24 Jul 2019 19:13:23 +0000 (14:13 -0500)]
test for more compilers
andy5995 [Wed, 24 Jul 2019 18:30:10 +0000 (13:30 -0500)]
show the logs if tests fail
andy5995 [Wed, 24 Jul 2019 06:08:30 +0000 (01:08 -0500)]
.travis.yml:install valgrind
(#498)
Eric Haszlakiewicz [Sat, 27 Jul 2019 03:08:11 +0000 (23:08 -0400)]
Merge pull request #495 from andy5995/README_typos
README.md:fix 2 typos
andy5995 [Fri, 26 Jul 2019 17:59:24 +0000 (12:59 -0500)]
"make its use in" [skip ci]
Eric Haszlakiewicz [Fri, 26 Jul 2019 13:48:34 +0000 (09:48 -0400)]
Merge pull request #500 from andy5995/add_missing_test_deps
test/Makefile.am:add missing deps for test1 and test2
andy5995 [Fri, 26 Jul 2019 03:55:07 +0000 (22:55 -0500)]
partial revert (make use) [skip ci]
Eric Haszlakiewicz [Fri, 26 Jul 2019 03:35:38 +0000 (03:35 +0000)]
Issue #498: Fix a memory leak bug introduced in test_double_serializer in
485f2a02 by adding a json_object_put call.
Eric Haszlakiewicz [Fri, 26 Jul 2019 02:58:22 +0000 (22:58 -0400)]
Merge pull request #496 from andy5995/pointer_doc
json_pointer.h:suggest minor grammar improvement for pointer doc
andy5995 [Thu, 25 Jul 2019 19:59:56 +0000 (14:59 -0500)]
test/Makefile.am:add missing deps for test1 and test2
Allows the tests to pass when running `make distcheck`
This fixes the 2 broken tests I mentioned at
https://github.com/json-c/json-c/pull/499#discussion_r306998261
andy5995 [Wed, 24 Jul 2019 04:53:06 +0000 (23:53 -0500)]
json_pointer.h:suggest minor grammar improvement for pointer doc
andy5995 [Wed, 24 Jul 2019 04:43:59 +0000 (23:43 -0500)]
README.md:fix 2 typos
Eric Haszlakiewicz [Sun, 9 Jun 2019 18:05:46 +0000 (14:05 -0400)]
Merge pull request #491 from ploxiln/disable_werror
build: add option --disable-werror to configure
Pierce Lopez [Sun, 9 Jun 2019 16:10:14 +0000 (12:10 -0400)]
tests: appease -Wwrite-strings
Pierce Lopez [Sun, 9 Jun 2019 14:55:50 +0000 (10:55 -0400)]
build: fix compiler option -Wwrite-strings
was typod as -Wwrite-string
Pierce Lopez [Sun, 9 Jun 2019 14:52:08 +0000 (10:52 -0400)]
build: add --disable-werror option to configure
to omit -Werror compiler option
Eric Haszlakiewicz [Fri, 31 May 2019 02:38:29 +0000 (22:38 -0400)]
Merge pull request #485 from myd7349/fix-cmake-module
Install CMake module files
Eric Haszlakiewicz [Tue, 28 May 2019 02:44:22 +0000 (02:44 +0000)]
Issue #486: append a missing ".0" to negative double values too.
myd7349 [Sat, 18 May 2019 11:44:29 +0000 (19:44 +0800)]
Install CMake module files
Eric Haszlakiewicz [Sat, 26 Jan 2019 15:55:50 +0000 (10:55 -0500)]
Merge pull request #474 from Jehan/fix-pc-file-cmake
Installation directories empty with CMake in pkg-config.
Jehan [Sat, 26 Jan 2019 11:30:40 +0000 (12:30 +0100)]
Installation directories empty with CMake in pkg-config.
CMake was not properly substituting the installation dir variables (they
ended up all empty), so the pkg-config results were also wrongs. For
instance cflags was: -I -I/json-c
Even though json-c was found at configure time, this obviously broke the
build of any application using it.
Eric Haszlakiewicz [Thu, 24 Jan 2019 03:47:27 +0000 (22:47 -0500)]
Merge pull request #473 from besser82/fixup/docs_utf8
Convert ChangeLog to valid UTF-8 encoding.
Björn Esser [Tue, 22 Jan 2019 16:07:00 +0000 (17:07 +0100)]
Clean trailing white-spaces in ChangeLog.
Björn Esser [Tue, 22 Jan 2019 15:59:50 +0000 (16:59 +0100)]
Convert ChangeLog to valid UTF-8 encoding.
Eric Haszlakiewicz [Wed, 19 Dec 2018 16:09:01 +0000 (11:09 -0500)]
Merge pull request #468 from rkalidas/compiler-fixes
Fix compiler warnings
Rubasri Kalidas [Tue, 18 Dec 2018 17:30:57 +0000 (11:30 -0600)]
Fix compiler warnings
Eric Haszlakiewicz [Wed, 12 Dec 2018 01:59:08 +0000 (20:59 -0500)]
Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452.
Eric Haszlakiewicz [Wed, 12 Dec 2018 01:17:43 +0000 (20:17 -0500)]
Merge pull request #453 from darjankrijan/master
Fixed misalignment in JSON string due to space after \n being printed...
Darjan Krijan [Fri, 7 Dec 2018 16:39:59 +0000 (17:39 +0100)]
Removed newly created test case and incorporated it into test1.test and test2.test
Darjan Krijan [Fri, 7 Dec 2018 16:30:15 +0000 (17:30 +0100)]
Added test cases for spaced pretty and pretty_tab used together
Eric Haszlakiewicz [Fri, 30 Nov 2018 14:49:35 +0000 (09:49 -0500)]
Merge pull request #454 from ramiropolla/json_object_private
json_object_private: save 8 bytes in struct json_object in 64-bit arc…
Eric Haszlakiewicz [Thu, 29 Nov 2018 01:39:42 +0000 (20:39 -0500)]
Merge pull request #461 from andy5995/issue_422
json_object.c:set errno in json_object_get_double()
Eric Haszlakiewicz [Thu, 29 Nov 2018 01:39:13 +0000 (20:39 -0500)]
Merge pull request #462 from andy5995/issue_460
json_object.h:document json_object_new_string_len()
andy5995 [Wed, 28 Nov 2018 22:55:19 +0000 (16:55 -0600)]
remove [in] from params description
Keeping this would be inconsistent with the other documentation
andy5995 [Tue, 27 Nov 2018 17:35:45 +0000 (11:35 -0600)]
json_object.h:document json_object_new_string_len()
I also added a couple trivial, but related, suggestions.
closes #460
andy5995 [Tue, 27 Nov 2018 03:12:06 +0000 (21:12 -0600)]
json_object.c:set errno in json_object_get_double()
closes #422
Eric Haszlakiewicz [Mon, 26 Nov 2018 02:19:02 +0000 (21:19 -0500)]
Merge pull request #459 from andy5995/issue_438
README.html:fix link to Doxygen docs, remove WIN32 link
Eric Haszlakiewicz [Mon, 26 Nov 2018 02:17:40 +0000 (21:17 -0500)]
Merge pull request #458 from andy5995/README_files_link
README.md:fix dead "file.html" link
Eric Haszlakiewicz [Mon, 26 Nov 2018 02:14:34 +0000 (21:14 -0500)]
Merge pull request #457 from andy5995/gitignore_build
.gitignore:add build directory
Eric Haszlakiewicz [Mon, 26 Nov 2018 02:14:14 +0000 (21:14 -0500)]
Merge pull request #456 from andy5995/style_perms
STYLE.txt:remove executable permissions
andy5995 [Sun, 25 Nov 2018 13:09:00 +0000 (07:09 -0600)]
README.html:fix link to Doxygen docs, remove WIN32 link
fixes #438
[skip ci]
andy5995 [Sun, 25 Nov 2018 12:51:21 +0000 (06:51 -0600)]
README.md:fix dead "file.html" link
andy5995 [Sun, 25 Nov 2018 12:45:21 +0000 (06:45 -0600)]
.gitignore:add build directory
andy5995 [Sun, 25 Nov 2018 12:43:02 +0000 (06:43 -0600)]
STYLE.txt:remove executable permissions
Ramiro Polla [Sat, 24 Nov 2018 02:36:51 +0000 (03:36 +0100)]
json_object_private: save 8 bytes in struct json_object in 64-bit architectures
- there is no need for _ref_count to be uint_fast32_t (the compiler
might decide to use a 64-bit int). make it uint32_t instead.
- reorder the 32-bit integer fields (o_type and _ref_count) so that
there is no wasted 4-byte gap after each of them.
Darjan Krijan [Wed, 21 Nov 2018 21:41:13 +0000 (22:41 +0100)]
Added a test for the space after \n issue with flags=JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_PRETTY|(JSON_C_TO_STRING_PRETTY_TAB) used in json_object_array_to_json_string
Darjan Krijan [Wed, 21 Nov 2018 21:34:01 +0000 (22:34 +0100)]
Removed spaces after \n for arrays as well
Darjan Krijan [Tue, 20 Nov 2018 21:21:27 +0000 (22:21 +0100)]
Fixed misalignment in JSON string due to space after \n being printed when choosing JSON_C_TO_STRING_SPACED together with JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string
Eric Haszlakiewicz [Sun, 21 Oct 2018 03:01:20 +0000 (23:01 -0400)]
Merge pull request #450 from drizt/subproject
Allow use json-c cmake as subproject
Ivan Romanov [Sat, 20 Oct 2018 05:50:15 +0000 (10:50 +0500)]
Allow use json-c cmake as subproject
Now json-c can be bundled to any cmake-based project and used with
couple lines of code:
add_subdirectory(json-c EXCLUDE_FROM_ALL)
target_link_libraries(MyProject json-c)
Eric Haszlakiewicz [Sat, 1 Sep 2018 19:06:14 +0000 (15:06 -0400)]
Re-add creation and installation of the json-c.pc file to the cmake build.
Eric Haszlakiewicz [Fri, 31 Aug 2018 05:16:53 +0000 (01:16 -0400)]
Merge pull request #444 from Hawk777/document-ref-count-tokener
Document refcount of json_tokener_parse_ex return
Christopher Head [Thu, 30 Aug 2018 16:18:29 +0000 (09:18 -0700)]
Document refcount of json_tokener_parse_ex return
Eric Haszlakiewicz [Wed, 15 Aug 2018 00:40:49 +0000 (20:40 -0400)]
Merge pull request #441 from changyongGuo/c_flag_error
fix c flag loss during cmake building
changyong guo [Tue, 14 Aug 2018 05:52:18 +0000 (13:52 +0800)]
fix c flag loss during cmake building
Eric Haszlakiewicz [Sat, 28 Jul 2018 15:59:46 +0000 (11:59 -0400)]
Merge pull request #434 from unmanned-player/devel
The real CMake support
Eric Haszlakiewicz [Fri, 27 Jul 2018 03:28:42 +0000 (23:28 -0400)]
Merge pull request #436 from jobol/master
Improve pkgconfig setting
Jose Bollo [Wed, 25 Jul 2018 13:45:01 +0000 (15:45 +0200)]
Improve pkgconfig setting
This changes allows to use #include <json-c/json.h>
instead of just #include <json.h>
This is normally possible but in some tricky case
this usage is broken without this change.
Here is the case that I encountered. I had to
compile json-c fresh version for some investigations
on newer versions. Then I installed it on my local
environment using option --prefix. After that I
had 2 versions:
- the system wide version in usual locations
/usr/lib and /usr/include
- mine in my HOME directory
Then, as I'm used to include <json-c/json.h>, the
included iheder's version was the system wide one
whereas the linked lib was mine.
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
Unmanned Player [Mon, 23 Jul 2018 22:06:13 +0000 (08:06 +1000)]
The real CMake support
This patch provides a CMakeLists.txt file to build JSON-C library without relying on auto-tools support. This makes the build a bit more portable and cleaner.
It can detect headers and symbols and generate config.h header file based on those detections. It cannot yet handle ctest(1) as the testing itself depends on comparing the output against files. Testing would need some creative abuse of CMake :) This will be provided a few patches later and may possibly involve refactoring test cases.
The patch has been tested on GCC 4.8.5 (Linux), GCC 7.2.0 (MinGW) and Microsoft Visual C++ 16.0 (2010?) locally. Also, compiles correctly on Travis CI and AppVeyor without errors.
Eric Haszlakiewicz [Fri, 13 Jul 2018 02:26:48 +0000 (22:26 -0400)]
Merge pull request #431 from LeSpocky/cmake
cmake: Bump required version
Alexander Dahl [Thu, 12 Jul 2018 19:25:38 +0000 (21:25 +0200)]
cmake: Bump required version
Using 'project(foo VERSION 1.0)' requires CMake 3.0, the VERSION option
is not part of CMake 2.8.7, see:
* https://cmake.org/cmake/help/v2.8.7/cmake.html#command:project
* https://cmake.org/cmake/help/v3.0/release/3.0.0.html#commands
The property C_STANDARD was introduced with CMake 3.1, see:
* https://cmake.org/cmake/help/v3.1/release/3.1.0.html#properties
Signed-off-by: Alexander Dahl <post@lespocky.de>
Eric Haszlakiewicz [Sun, 24 Jun 2018 02:10:55 +0000 (22:10 -0400)]
Explain why we're not setting the output name for static libraries when on Windows.
Eric Haszlakiewicz [Sun, 24 Jun 2018 02:08:25 +0000 (22:08 -0400)]
Merge pull request #415 from sgbihu/master
Resolve windows name conflict
Eric Haszlakiewicz [Fri, 15 Jun 2018 02:24:15 +0000 (22:24 -0400)]
Issue #418: Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures.
Eric Haszlakiewicz [Wed, 13 Jun 2018 03:16:31 +0000 (23:16 -0400)]
Issue #419: document that NULL may be passed to json_object_put().
Eric Haszlakiewicz [Sat, 9 Jun 2018 03:45:47 +0000 (23:45 -0400)]
Merge pull request #421 from lt-holman/install_header_file
install json_object_iterator.h header file
Keith Holman [Thu, 7 Jun 2018 17:19:27 +0000 (13:19 -0400)]
install json_object_iterator.h header file
When building the project using cmake then installing it. The
definitions in `json_object_iterator.h` are required but not installed
by the cmake install rule. This patch adds the `json_object_iterator.h`
file to the list of files to install.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
Eric Haszlakiewicz [Sun, 3 Jun 2018 03:01:04 +0000 (23:01 -0400)]
Merge pull request #420 from angelskieglazki/master
arraylist: Fixed names of parameters for callback function
max [Fri, 1 Jun 2018 15:21:06 +0000 (18:21 +0300)]
arraylist: Fix names of parameters for callback function
Eric Haszlakiewicz [Mon, 28 May 2018 01:50:57 +0000 (21:50 -0400)]
Always create debug info (pdb file) even for release builds.
Eric Haszlakiewicz [Sun, 27 May 2018 22:20:32 +0000 (18:20 -0400)]
Try the appveyor changes again, using %Configuration% instead of "Debug"