Eric Haszlakiewicz
d305cae12c
Ignore the tests/testReplaceExisting binary.
13 years ago
Eric Haszlakiewicz
8ce53f9d1e
Note the rename in the ChangeLog, and update the instructions in the README file.
13 years ago
Eric Haszlakiewicz
2f2180b70d
Take a guess as to the rename changes changes needed to the Android part of the build.
I think this should work, but I can't test it.
13 years ago
Eric Haszlakiewicz
1f9d199522
Re-add the "json" pkg-config file as a compatibility shim.
Also rename the json-c-uninstalled.pc file.
13 years ago
Eric Haszlakiewicz
9f16e25a3e
Bump the version of the new library since programs will need to be re-linked to use it.
13 years ago
Eric Haszlakiewicz
943b7a4de7
Add a compatibility symlink json->json-c in the include directory.
13 years ago
Eric Haszlakiewicz
075b783631
Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so
13 years ago
Eric Haszlakiewicz
c7a21203de
Ignore a couple more generated files.
13 years ago
Eric Haszlakiewicz
082419edf9
Fix the Libs line in json-uninstalled.pc to use -ljson-c
13 years ago
Eric Haszlakiewicz
b98aa6eaa3
Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library.
13 years ago
Eric Haszlakiewicz
eb37094aa6
Check for the sys/cdefs.h header which on some systems defines the __warn_references macro.
13 years ago
Eric Haszlakiewicz
ba1c3810cb
Remove test_parse from the top level directory. (accidentally re-introduced with the last merge)
13 years ago
Eric Haszlakiewicz
c2d3ccf3af
Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library
Conflicts:
.gitignore
Makefile.am
configure.in
printbuf.c
test1.c
test1.expected
13 years ago
Eric Haszlakiewicz
92f31bd99a
Handle the \f escape sequence (the two characters: backslash followed by an f, not a literal formfeed) and extend the test_parse test to check all valid escape sequences.
13 years ago
Eric Haszlakiewicz
8fcfeb63ec
Default autogen.sh to not running configure, unless some command line options are specified.
13 years ago
Eric Haszlakiewicz
77c6239465
Initialize errno before calling sscanf in json_parse_int64() so parsing valid numbers after parsing an out of range number works.
13 years ago
Eric Haszlakiewicz
2da148df56
Merge pull request #37 from cgwalters/master
autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1 …
13 years ago
Eric Haszlakiewicz
6988f53fcb
Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid.
This is particularly useful when replacing values in a loop, since it allows
the key used by json_object_object_foreach to continue to be used.
13 years ago
Colin Walters
6d9437725a
autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
First, we should be able to execute as "./autogen.sh". Second,
add support for NOCONFIGURE=1. For more information,
see http://people.gnome.org/~walters/docs/build-api.txt
13 years ago
Eric Haszlakiewicz
381f77c5bc
Merge pull request #26 from ford-prefect/master
Android build system
13 years ago
Eric Haszlakiewicz
4154c55eda
Add json_object_iterator.h to installed headers.
13 years ago
Eric Haszlakiewicz
9791c3896e
Fix git commands for tagging a release.
13 years ago
Eric Haszlakiewicz
eead1a7dc4
Remove unnecessary comment from json_util.c
13 years ago
Eric Haszlakiewicz
7bd49df30a
Merge pull request #33 from mloskot/master
Added a bunch of missing HAVE_* defines
13 years ago
Mateusz Loskot
984303dfe5
Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code.
13 years ago
Eric Haszlakiewicz
a789601e6d
Merge pull request #27 from OBI-1/master
array_list_expand_internal needs length, not index.
13 years ago
Eric Haszlakiewicz
c58386f33f
Merge pull request #29 from mloskot/msvc-port
Add missing casts from void* and replace #if HAVE_X with #ifdef HAVE_X
13 years ago
Eric Haszlakiewicz
837d685d78
Use "nodoc", not "doc", for the name of the tarball w/o docs.
13 years ago
Mateusz Loskot
271c53ebdd
Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++.
13 years ago
Mateusz Loskot
a6f39a3c0c
Replaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker with #define HAVE_X where #define HAVE_X 1|0 is meant.
13 years ago
OBI-1
b6ff1c2f71
array_list_expand_internal needs length, not index.
(The current implementation will fail when adding index 65.)
13 years ago
Eric Haszlakiewicz
1abaaee658
Update the ChangeLog with the rest of the changes that will be included in the 0.10 release.
13 years ago
Eric Haszlakiewicz
e7bd2e97f3
Fill in the missing pieces of the release checklist.
13 years ago
Eric Haszlakiewicz
0cc1db6459
Change the format used for sprintbuf (but not scanf) to use %f instead of %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW).
Thanks for Mateusz Loskot for the fix.
13 years ago
Eric Haszlakiewicz
31faa49bd8
Ignore the new test1Formatted and test2Formatted executables.
13 years ago
Eric Haszlakiewicz
4c7f38eb9b
Extend test1 and test2 to run using json_object_to_json_string_ext() based on an additional command line parameter.
Extend the run_output_test() function so we actually can pass command line
parameters and so we can support different output files for the same test
executable.
Also provide some hints about what to do if a test fails (i.e. set VERBOSE=1).
13 years ago
Eric Haszlakiewicz
3fcffe1bb0
Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected.
There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY.
This also add a json_object_to_file_ext() that takes the same flags.
Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED.
Thanks fo Grant Edwards for the initial patches.
13 years ago
Arun Raghavan
a1221eba70
Add an Android-friendly build system
This dependson the Androgenizer project, which helps keep autofoo-based build
systems in sync with the Android build.
13 years ago
Arun Raghavan
17caddc0ab
Run configure in the autogen.sh script
This is convention in most open source projects.
13 years ago
Arun Raghavan
cb29a77c94
Add a pkgconfig file for uninstalled builds
This allows systems certain types of build setups to work. Specifically, this
will help when building on Android and using json-c as a dependency for another
package.
13 years ago
Eric Haszlakiewicz
f931f61851
Fixed parsing numbers in E notation. `
13 years ago
Eric Haszlakiewicz
4e000a65e6
Since we already use a local json_bool type, replace any stdbool.h usage with
that, since not all environments actually have a stdbool.h to use.
13 years ago
Eric Haszlakiewicz
0f8c534502
Merge pull request #25 from kdopen/doc_cleanup
Clean up documentation and correct sample code
13 years ago
Keith Derrick
ded667a612
Clean up documentation and correct sample code
13 years ago
Eric Haszlakiewicz
ec7ce26ba8
Merge pull request #23 from mloskot/mloskot-msvc-fixes
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. ...
13 years ago
Mateusz Loskot
8409dc039a
Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22 .
13 years ago
Eric Haszlakiewicz
178a4b059c
Merge pull request #21 from kdopen/add_iterator
Add new iterator implementation and some NULL-pointer safety
13 years ago
Eric Haszlakiewicz
7502b377b7
Merge branch 'master' of https://github.com/json-c/json-c
13 years ago
Eric Haszlakiewicz
3d8817978c
Actually save the expected output for the test_printbuf test so it passes.
13 years ago
Eric Haszlakiewicz
37cfe6bc4c
Update the list of files to ignore.
13 years ago