Joakim Soderberg
e40d52c550
Consolidated the CMake project.
...
- Moved everything to one CMakeLists.txt
- Added support for the json_process test suites (instead of just the API
tests).
- Changed to use the modified json_process version that does away with the
environment variables (originally written by DanielT).
- Had to exclude "test_memory_funcs" on MSVC, since void pointer
arithmetics are not allowed as it is done in secure_malloc and
secure_free.
- Had to add a check for "ssize_t". This is not available on Windows and
maybe on some other platforms (used in test_pack.c)
- Result from running ctest (The failure seems unrelated to CMake, it's
just that the expected result is in a different order):
99% tests passed, 1 tests failed out of 121
Total Test time (real) = 1.31 sec
The following tests FAILED:
24 - valid__complex-array (Failed)
2013-03-07 16:11:07 +01:00
Paul Harris
3d5bea5714
Fixes for cmake for MSVC2010
2013-03-07 16:06:38 +01:00
Paul Harris
3e03b07831
Add CMake build system.
...
Added multiple CMake-related files to project.
Supports building the library and the tests.
See CMakeLists.txt for notes on how it works.
I had to adjust 3 existing files in order to disable some configuration
that should be taken care of by cmake/automake anyway.
I also added jansson.def from a future jansson version,
to test cmake's support for .def files (which works fine).
2013-03-07 16:06:01 +01:00
Petri Lehtinen
e00cd4f941
Merge branch '2.4'
2013-02-05 12:51:06 +02:00
Petri Lehtinen
a1882fee02
check-exports test: Filter out symbols that start with an underscore
...
These are usually internal to libc, and such symbols are exported in
the shared library on some platforms.
2013-02-05 12:48:38 +02:00
Petri Lehtinen
4a5626695c
Merge branch '2.4'
2013-02-04 09:55:39 +02:00
Petri Lehtinen
afa1d37e20
Enable -Werror in Travis builds
2013-02-04 09:55:34 +02:00
Petri Lehtinen
b9967fdbcf
Merge branch '2.4'
2013-02-04 09:52:31 +02:00
Petri Lehtinen
ccf6e48a52
Don't use -Werror by default
...
It may be problematic when compilers add new warnings over time.
./configure && make should always just work.
2013-02-04 09:51:42 +02:00
Petri Lehtinen
93a3c7f663
Enable gcc specific flags in tests correctly
...
... and fix issues found.
2013-02-04 09:49:58 +02:00
Petri Lehtinen
5dbac70a67
Compress bz2 doc tarballs with bzip2 instead of gzip
...
Fixes #99 .
2013-01-06 14:18:28 +02:00
Petri Lehtinen
40c2e532b9
Merge branch '2.4'
2013-01-03 10:46:46 +02:00
Petri Lehtinen
02beb90db3
Make it possible to forward declare struct json_t
...
This allows e.g. to use json_t in a header file that doesn't include
jansson.h:
struct json_t;
typedef struct json_t json_t;
json_t *foo(json_t *bar);
2013-01-03 10:45:38 +02:00
Petri Lehtinen
92bf4f6fa8
Merge branch '2.4'
2012-12-28 15:30:18 +02:00
Petri Lehtinen
8ad98c9ad3
Add travis build status image more cleverly
2012-12-28 15:30:15 +02:00
Petri Lehtinen
7a4ec36f31
Merge branch '2.4'
2012-12-28 14:27:49 +02:00
Petri Lehtinen
3fab956599
Add travis build status to README.rst
2012-12-28 14:27:31 +02:00
Petri Lehtinen
a2de27a828
travis: Run "make check" instead of "make test"
2012-12-28 14:22:24 +02:00
Petri Lehtinen
99855b2d63
travis: Bootstrap autotools before building
2012-12-28 14:20:25 +02:00
Petri Lehtinen
08c5ec8f01
Merge branch '2.4'
2012-12-28 14:11:59 +02:00
Petri Lehtinen
e9cb9dbf60
Fix // -> /* */
2012-12-28 14:11:43 +02:00
Petri Lehtinen
8284b7d3da
Merge branch '2.4'
2012-12-23 07:10:02 +02:00
Petri Lehtinen
511db446d7
Add Travis configuration
2012-12-23 07:09:55 +02:00
Petri Lehtinen
b98be1f18d
Merge branch '2.4'
2012-12-10 08:47:11 +02:00
Jacob Potter
872f847655
Change const pointer to array
...
Closes #95 .
2012-12-10 08:47:00 +02:00
Jacob Potter
f86bb0377f
Mark some constant data as const.
...
Issue #95 .
2012-12-10 08:47:00 +02:00
Attie Grande
c82cea9d32
fixed l_isxdigit() macro
...
Closes #97 .
2012-12-10 08:47:00 +02:00
Petri Lehtinen
67c002f7c9
Merge branch '2.4'
2012-12-04 21:23:33 +02:00
Petri Lehtinen
e0a7f81b39
Really fix the off-by-one error in json_array_remove()
...
It didn't affect only the last element but all of them. One item too
much was always moved.
2012-12-04 21:20:59 +02:00
Petri Lehtinen
7b35a18ac0
Merge branch '2.4'
2012-12-04 09:33:48 +02:00
Petri Lehtinen
54d59c743c
Fix an off-by-one error in json_array_remove()
...
Uninitialized memory was read when the last item of a "full" array was
removed.
2012-12-04 09:32:45 +02:00
Petri Lehtinen
6279610ce4
Merge branch '2.4'
2012-10-26 15:55:00 +03:00
Petri Lehtinen
ac0ca9223b
Merge pull request #93 from bertwesarg/vpath-for-2.4
...
Support building and testing with VPATH.
2012-10-26 05:48:32 -07:00
Bert Wesarg
4853a3454c
Support building and testing with VPATH.
2012-10-26 14:43:46 +02:00
Petri Lehtinen
cf1074e70e
Add a script for making releases
2012-09-23 13:42:56 +03:00
Petri Lehtinen
5804e9de9b
Set master for 2.5 development mode
2012-09-23 13:41:40 +03:00
Petri Lehtinen
3279aacdee
jansson 2.4
2012-09-23 12:52:41 +03:00
Petri Lehtinen
2158670177
Distribute win32 files
2012-09-23 12:52:40 +03:00
Petri Lehtinen
4cff593dd4
Update CHANGES for v2.4
2012-09-22 14:26:16 +03:00
Petri Lehtinen
597423ea80
doc: Add versionadded directive for json_boolean()
2012-09-22 14:25:29 +03:00
Petri Lehtinen
c3fc1d7382
Merge pull request #90 from luke-jr/patch-1
...
Add -no-undefined to LDFLAGS
2012-09-18 21:11:26 -07:00
Luke Dashjr
c922354076
Add -no-undefined to LDFLAGS
...
This tells libtool that jansson does not require any external symbols, and allows building it as a shared library (DLL) on Windows.
2012-09-15 08:45:29 +00:00
Petri Lehtinen
4118315afa
Disallow NaN or Inf real values
2012-09-13 21:30:19 +03:00
Petri Lehtinen
ee13c667f1
Fix json_real_set() to return -1 on error
2012-09-13 08:46:56 +03:00
Petri Lehtinen
23d563434a
Fix a typo on doc/apiref.rst
2012-09-06 12:06:41 +03:00
Petri Lehtinen
6142dbd8d0
Fix a typo in README.rst
2012-09-05 21:16:43 +03:00
Petri Lehtinen
0dac319bc4
CHANGES entry for #88
2012-08-11 20:45:25 +03:00
Petri Lehtinen
0b871a113c
Merge branch '2.3'
2012-08-11 20:45:15 +03:00
Alessandro Ghedini
8176527f56
fix check-exports test on ppc64
2012-08-11 20:42:21 +03:00
Petri Lehtinen
ec7bb71d75
Add an initial CHANGES entry for v2.4
2012-07-30 07:52:41 +03:00
