Author: martinkl
Date: Thu Jan 21 10:58:11 2016
New Revision: 1725901
URL: http://svn.apache.org/viewvc?rev=1725901&view=rev
Log:
AVRO-1769. C: Use operating system's libjansson instead of bundling it with
Avro. Contributed by Magnus Edenhill.
Removed:
avro/branches/branch-1.8/lang/c/jansson/
Modified:
avro/branches/branch-1.8/CHANGES.txt
avro/branches/branch-1.8/LICENSE.txt
avro/branches/branch-1.8/lang/c/CMakeLists.txt
avro/branches/branch-1.8/lang/c/INSTALL
avro/branches/branch-1.8/lang/c/LICENSE
avro/branches/branch-1.8/lang/c/README.maintaining_win32.txt
avro/branches/branch-1.8/lang/c/docs/index.txt
avro/branches/branch-1.8/lang/c/src/CMakeLists.txt
avro/branches/branch-1.8/lang/c/tests/test_avro_data.c
avro/branches/branch-1.8/share/docker/Dockerfile
Modified: avro/branches/branch-1.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/CHANGES.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/CHANGES.txt (original)
+++ avro/branches/branch-1.8/CHANGES.txt Thu Jan 21 10:58:11 2016
@@ -255,6 +255,9 @@ Avro 1.8.0 (15 December 2015)
AVRO-1782. Ruby: Fix unit test failures in new versions of Ruby. (martinkl)
+ AVRO-1769. C: Use operating system's libjansson instead of bundling
+ it with Avro. (Magnus Edenhill via martinkl)
+
Avro 1.7.7 (23 July 2014)
NEW FEATURES
Modified: avro/branches/branch-1.8/LICENSE.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/LICENSE.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/LICENSE.txt (original)
+++ avro/branches/branch-1.8/LICENSE.txt Thu Jan 21 10:58:11 2016
@@ -233,158 +233,6 @@ Some files include an additional copyrig
| THE SOFTWARE.
----------------------------------------------------------------------
-License for the libtool scripts used in the Jansson C JSON parser:
-
-libtool (GNU libtool) 2.2.10
-Written by Gordon Matzigkeit <[email protected]>, 1996
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-Included under the terms of the Apache License version 2.0.
-
-| GNU Libtool is free software; you can redistribute it and/or modify
-| it under the terms of the GNU General Public License as published by
-| the Free Software Foundation; either version 2 of the License, or
-| (at your option) any later version.
-|
-| As a special exception to the GNU General Public License,
-| if you distribute this file as part of a program or library that
-| is built using GNU Libtool, you may include this file under the
-| same distribution terms that you use for the rest of that program.
-|
-| GNU Libtool is distributed in the hope that it will be useful, but
-| WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-| General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with GNU Libtool; see the file COPYING. If not, a copy
-| can be downloaded from http://www.gnu.org/licenses/gpl.html,
-| or obtained by writing to the Free Software Foundation, Inc.,
-| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-----------------------------------------------------------------------
-License for the configure script used in the Jansson C JSON parser:
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
-
-| This configure script is free software; the Free Software Foundation
-| gives unlimited permission to copy, distribute and modify it.
-
-Portions of the configure script are from libtool (see above) and are
-included under the terms of the Apache License version 2.0.
-
-----------------------------------------------------------------------
-License for the install-sh script used in the Jansson C JSON parser:
-
-Copyright (C) 1994 X Consortium
-
-| This originates from X11R5 (mit/util/scripts/install.sh), which was
-| later released in X11R6 (xc/config/util/install.sh) with the
-| following copyright and license.
-|
-| Permission is hereby granted, free of charge, to any person obtaining a copy
-| of this software and associated documentation files (the "Software"), to
-| deal in the Software without restriction, including without limitation the
-| rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-| sell copies of the Software, and to permit persons to whom the Software is
-| furnished to do so, subject to the following conditions:
-|
-| The above copyright notice and this permission notice shall be included in
-| all copies or substantial portions of the Software.
-|
-| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-| X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-| AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-| TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-|
-| Except as contained in this notice, the name of the X Consortium shall not
-| be used in advertising or otherwise to promote the sale, use or other deal-
-| ings in this Software without prior written authorization from the X Consor-
-| tium.
-|
-| FSF changes to this file are in the public domain.
-
-----------------------------------------------------------------------
-License for the aclocal.m4 script used in the Jansson C JSON parser:
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-| This file is free software; the Free Software Foundation
-| gives unlimited permission to copy and/or distribute it,
-| with or without modifications, as long as this notice is preserved.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-| even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-| PARTICULAR PURPOSE.
-
-Portions of the aclocal.m4 file are from libtool (see above) and are
-included under the terms of the Apache License version 2.0.
-
-----------------------------------------------------------------------
-License for build scripts used in the Jansson C JSON parser:
-
-* config.guess
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-* missing
- Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
- Originally by Fran,cois Pinard <[email protected]>, 1996.
-* config.sub
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
- Inc.
-* depcomp
- Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
- Foundation, Inc.
- Originally written by Alexandre Oliva <[email protected]>.
-
-Included under the terms of the Apache License version 2.0.
-
-| This file is free software; you can redistribute it and/or modify it
-| under the terms of the GNU General Public License as published by
-| the Free Software Foundation; either version 2 of the License, or
-| (at your option) any later version.
-|
-| This program is distributed in the hope that it will be useful, but
-| WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-| General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, write to the Free Software
-| Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-| 02110-1301, USA.
-|
-| As a special exception to the GNU General Public License, if you
-| distribute this file as part of a program that contains a
-| configuration script generated by Autoconf, you may include it under
-| the same distribution terms that you use for the rest of that program.
-
-----------------------------------------------------------------------
-License for Makefile.in files used in the Jansson C JSON parser:
-
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-
-| This Makefile.in is free software; the Free Software Foundation
-| gives unlimited permission to copy and/or distribute it,
-| with or without modifications, as long as this notice is preserved.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-| even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-| PARTICULAR PURPOSE.
-
-----------------------------------------------------------------------
License for msinttypes.h and msstdint.h used in the C implementation:
Source from:
http://code.google.com/p/msinttypes/downloads/detail?name=msinttypes-r26.zip
Modified: avro/branches/branch-1.8/lang/c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/CMakeLists.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/CMakeLists.txt (original)
+++ avro/branches/branch-1.8/lang/c/CMakeLists.txt Thu Jan 21 10:58:11 2016
@@ -123,7 +123,6 @@ if(UNIX AND THREADSAFE AND CMAKE_COMPILE
endif(UNIX AND THREADSAFE AND CMAKE_COMPILER_IS_GNUCC)
include_directories(${AvroC_SOURCE_DIR}/src)
-include_directories(${AvroC_SOURCE_DIR}/jansson/src)
# Enable codecs
@@ -169,6 +168,16 @@ endif (LZMA_FOUND)
set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES})
set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@")
+# Jansson JSON library
+pkg_check_modules(JANSSON jansson>=2.3)
+if (JANSSON_FOUND)
+ set(JANSSON_PKG libjansson)
+ include_directories(${JANSSON_INCLUDE_DIR})
+ link_directories(${JANSSON_LIBRARY_DIRS})
+else (JANSSON_FOUND)
+ message(FATAL_ERROR "libjansson >=2.3 not found")
+endif (JANSSON_FOUND)
+
add_subdirectory(src)
add_subdirectory(examples)
Modified: avro/branches/branch-1.8/lang/c/INSTALL
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/INSTALL?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/INSTALL (original)
+++ avro/branches/branch-1.8/lang/c/INSTALL Thu Jan 21 10:58:11 2016
@@ -13,14 +13,20 @@ Prerequisites
Avro uses CMake [1] as its build manager. You must have this installed,
along with a C compiler (such as gcc) to build the library.
-Avro doesn't depend on any other libraries, but you need asciidoc [2]
-and source-highlight [3] installed to build Avro's documentation. The
-build scripts will automatically detect whether these tools are
-installed, and will skip the documentation if they're not.
+Avro depends on the Jansson JSON parser [2], version 2.3 or higher. On
+many operating systems this library is available through your package
+manager (for example, `apt-get install libjansson-dev` on Ubuntu/Debian,
+and `brew install jansson` on Mac OS). If not, please download and
+install it from source [2].
+
+To build the documentation you need asciidoc [3] and source-highlight [4]
+installed. The build scripts will automatically detect whether these
+tools are installed, and will skip the documentation if they're not.
[1] http://www.cmake.org/
-[2] http://www.methods.co.nz/asciidoc
-[3] http://www.gnu.org/software/src-highlite/
+[2] http://www.digip.org/jansson/
+[3] http://www.methods.co.nz/asciidoc
+[4] http://www.gnu.org/software/src-highlite/
Building from source
Modified: avro/branches/branch-1.8/lang/c/LICENSE
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/LICENSE?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/LICENSE (original)
+++ avro/branches/branch-1.8/lang/c/LICENSE Thu Jan 21 10:58:11 2016
@@ -202,189 +202,6 @@
limitations under the License.
----------------------------------------------------------------------
-License for the Jansson C JSON parser used in the C implementation:
-
-Copyright (c) 2009-2011 Petri Lehtinen <[email protected]>
-
-Some files include an additional copyright notice:
-* lang/c/jansson/src/pack_unpack.c
- Copyright (c) 2011 Graeme Smecher <[email protected]>
-* lang/c/jansson/test/suites/api/test_unpack.c
- Copyright (c) 2011 Graeme Smecher <[email protected]>
-* lang/c/jansson/src/memory.c
- Copyright (c) 2011 Basile Starynkevitch <[email protected]>
-
-| Permission is hereby granted, free of charge, to any person obtaining a copy
-| of this software and associated documentation files (the "Software"), to deal
-| in the Software without restriction, including without limitation the rights
-| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-| copies of the Software, and to permit persons to whom the Software is
-| furnished to do so, subject to the following conditions:
-|
-| The above copyright notice and this permission notice shall be included in
-| all copies or substantial portions of the Software.
-|
-| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-| THE SOFTWARE.
-
-----------------------------------------------------------------------
-License for the libtool scripts used in the Jansson C JSON parser:
-
-libtool (GNU libtool) 2.2.10
-Written by Gordon Matzigkeit <[email protected]>, 1996
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-Included under the terms of the Apache License version 2.0.
-
-| GNU Libtool is free software; you can redistribute it and/or modify
-| it under the terms of the GNU General Public License as published by
-| the Free Software Foundation; either version 2 of the License, or
-| (at your option) any later version.
-|
-| As a special exception to the GNU General Public License,
-| if you distribute this file as part of a program or library that
-| is built using GNU Libtool, you may include this file under the
-| same distribution terms that you use for the rest of that program.
-|
-| GNU Libtool is distributed in the hope that it will be useful, but
-| WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-| General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with GNU Libtool; see the file COPYING. If not, a copy
-| can be downloaded from http://www.gnu.org/licenses/gpl.html,
-| or obtained by writing to the Free Software Foundation, Inc.,
-| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-----------------------------------------------------------------------
-License for the configure script used in the Jansson C JSON parser:
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
-
-| This configure script is free software; the Free Software Foundation
-| gives unlimited permission to copy, distribute and modify it.
-
-Portions of the configure script are from libtool (see above) and are
-included under the terms of the Apache License version 2.0.
-
-----------------------------------------------------------------------
-License for the install-sh script used in the Jansson C JSON parser:
-
-Copyright (C) 1994 X Consortium
-
-| This originates from X11R5 (mit/util/scripts/install.sh), which was
-| later released in X11R6 (xc/config/util/install.sh) with the
-| following copyright and license.
-|
-| Permission is hereby granted, free of charge, to any person obtaining a copy
-| of this software and associated documentation files (the "Software"), to
-| deal in the Software without restriction, including without limitation the
-| rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-| sell copies of the Software, and to permit persons to whom the Software is
-| furnished to do so, subject to the following conditions:
-|
-| The above copyright notice and this permission notice shall be included in
-| all copies or substantial portions of the Software.
-|
-| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-| X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-| AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-| TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-|
-| Except as contained in this notice, the name of the X Consortium shall not
-| be used in advertising or otherwise to promote the sale, use or other deal-
-| ings in this Software without prior written authorization from the X Consor-
-| tium.
-|
-| FSF changes to this file are in the public domain.
-
-----------------------------------------------------------------------
-License for the aclocal.m4 script used in the Jansson C JSON parser:
-
-Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-| This file is free software; the Free Software Foundation
-| gives unlimited permission to copy and/or distribute it,
-| with or without modifications, as long as this notice is preserved.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-| even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-| PARTICULAR PURPOSE.
-
-Portions of the aclocal.m4 file are from libtool (see above) and are
-included under the terms of the Apache License version 2.0.
-
-----------------------------------------------------------------------
-License for build scripts used in the Jansson C JSON parser:
-
-* config.guess
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-* missing
- Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
- Originally by Fran,cois Pinard <[email protected]>, 1996.
-* config.sub
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
- Inc.
-* depcomp
- Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
- Foundation, Inc.
- Originally written by Alexandre Oliva <[email protected]>.
-
-Included under the terms of the Apache License version 2.0.
-
-| This file is free software; you can redistribute it and/or modify it
-| under the terms of the GNU General Public License as published by
-| the Free Software Foundation; either version 2 of the License, or
-| (at your option) any later version.
-|
-| This program is distributed in the hope that it will be useful, but
-| WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-| General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, write to the Free Software
-| Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-| 02110-1301, USA.
-|
-| As a special exception to the GNU General Public License, if you
-| distribute this file as part of a program that contains a
-| configuration script generated by Autoconf, you may include it under
-| the same distribution terms that you use for the rest of that program.
-
-----------------------------------------------------------------------
-License for Makefile.in files used in the Jansson C JSON parser:
-
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-
-| This Makefile.in is free software; the Free Software Foundation
-| gives unlimited permission to copy and/or distribute it,
-| with or without modifications, as long as this notice is preserved.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-| even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-| PARTICULAR PURPOSE.
-
-----------------------------------------------------------------------
License for msinttypes.h and msstdint.h used in the C implementation:
Source from:
http://code.google.com/p/msinttypes/downloads/detail?name=msinttypes-r26.zip
Modified: avro/branches/branch-1.8/lang/c/README.maintaining_win32.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/README.maintaining_win32.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/README.maintaining_win32.txt (original)
+++ avro/branches/branch-1.8/lang/c/README.maintaining_win32.txt Thu Jan 21
10:58:11 2016
@@ -143,10 +143,10 @@ Instructions for Maintenance
include msdirent.h. See example in test_avro_schema.c.
16. If _WIN32 is defined, define snprintf() to_snprintf(), which MS
- Visual C++ recognizes. See jansson_private.h for an example.
+ Visual C++ recognizes.
17. MSVC++ does not recognize strtoll(). Define it to _strtoi64()
- instead. See jansson/src/load.c for an example.
+ instead.
18. Old-style C function declarations are not allowed in C++. See the
changes in st.c and st.h -- which were converted to new-style
Modified: avro/branches/branch-1.8/lang/c/docs/index.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/docs/index.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/docs/index.txt (original)
+++ avro/branches/branch-1.8/lang/c/docs/index.txt Thu Jan 21 10:58:11 2016
@@ -36,9 +36,14 @@ ____
The C implementation has been tested on +MacOSX+ and +Linux+ but, over
time, the number of support OSes should grow. Please let us know if
-you're using +Avro C+ on other systems. There are no dependencies on
-external libraries. We embedded http://www.digip.org/jansson/[Jansson] into
-+Avro C+ for parsing JSON into schema structures.
+you're using +Avro C+ on other systems.
+
+Avro depends on the http://www.digip.org/jansson/[Jansson JSON parser],
+version 2.3 or higher. On many operating systems this library is
+available through your package manager (for example,
++apt-get install libjansson-dev+ on Ubuntu/Debian, and
++brew install jansson+ on Mac OS). If not, please download and install
+it from source.
The C implementation supports:
Modified: avro/branches/branch-1.8/lang/c/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/src/CMakeLists.txt?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/src/CMakeLists.txt (original)
+++ avro/branches/branch-1.8/lang/c/src/CMakeLists.txt Thu Jan 21 10:58:11 2016
@@ -76,39 +76,22 @@ set(AVRO_SRC
wrapped-buffer.c
)
-set(JANSSON_SRC
- ../jansson/src/dump.c
- ../jansson/src/error.c
- ../jansson/src/hashtable.c
- ../jansson/src/hashtable.h
- ../jansson/src/jansson.h
- ../jansson/src/jansson_private.h
- ../jansson/src/load.c
- ../jansson/src/memory.c
- ../jansson/src/pack_unpack.c
- ../jansson/src/strbuffer.c
- ../jansson/src/strbuffer.h
- ../jansson/src/utf.c
- ../jansson/src/utf.h
- ../jansson/src/value.c
-)
source_group(Avro FILES ${AVRO_SRC})
-source_group(Jansson FILES ${JANSSON_SRC})
# The version.sh script gives us a SOVERSION that uses colon as a
# separator; we need periods.
string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION})
-add_library(avro-static STATIC ${AVRO_SRC} ${JANSSON_SRC})
-target_link_libraries(avro-static ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+add_library(avro-static STATIC ${AVRO_SRC})
+target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES}
${THREADS_LIBRARIES})
set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)
if (NOT WIN32)
# TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL
-add_library(avro-shared SHARED ${AVRO_SRC} ${JANSSON_SRC})
-target_link_libraries(avro-shared ${CODEC_LIBRARIES} ${THREADS_LIBRARIES})
+add_library(avro-shared SHARED ${AVRO_SRC})
+target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES}
${THREADS_LIBRARIES})
set_target_properties(avro-shared PROPERTIES
OUTPUT_NAME avro
SOVERSION ${LIBAVRO_DOT_VERSION})
Modified: avro/branches/branch-1.8/lang/c/tests/test_avro_data.c
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/lang/c/tests/test_avro_data.c?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/lang/c/tests/test_avro_data.c (original)
+++ avro/branches/branch-1.8/lang/c/tests/test_avro_data.c Thu Jan 21 10:58:11
2016
@@ -142,7 +142,7 @@ static void test_json(avro_datum_t datum
{
char *json = NULL;
avro_datum_to_json(datum, 1, &json);
- if (strcmp(json, expected) != 0) {
+ if (strcasecmp(json, expected) != 0) {
fprintf(stderr, "Unexpected JSON encoding: %s\n", json);
exit(EXIT_FAILURE);
}
Modified: avro/branches/branch-1.8/share/docker/Dockerfile
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.8/share/docker/Dockerfile?rev=1725901&r1=1725900&r2=1725901&view=diff
==============================================================================
--- avro/branches/branch-1.8/share/docker/Dockerfile (original)
+++ avro/branches/branch-1.8/share/docker/Dockerfile Thu Jan 21 10:58:11 2016
@@ -27,7 +27,7 @@ RUN curl -sL https://deb.nodesource.com/
# Install dependencies from packages
RUN apt-get update && apt-get install --no-install-recommends -y \
git subversion curl ant make maven \
- gcc cmake asciidoc source-highlight \
+ gcc cmake libjansson-dev asciidoc source-highlight \
g++ flex bison libboost-all-dev doxygen \
mono-devel mono-gmcs nunit \
nodejs \
