Skip to content

Commit

Permalink
Tag 1.5.1 release.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/avro/tags/release-1.5.1@1100312 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
cutting committed May 6, 2011
1 parent 12e0994 commit cb6560b
Show file tree
Hide file tree
Showing 140 changed files with 119 additions and 13,952 deletions.
3 changes: 0 additions & 3 deletions doc/src/content/xdocs/idl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,6 @@ void fireAndForget(string message) oneway;
<p>All Java-style comments are supported within a Avro IDL file. Any text following
<code>//</code> on a line is ignored, as is any text between <code>/*</code> and
<code>*/</code>, possibly spanning multiple lines.</p>
<p>Comments that begin with <code>/**</code> are used as the
documentation string for the type or field definition that
follows the comment.</p>
</section>
<section id="minutiae_escaping">
<title>Escaping Identifiers</title>
Expand Down
11 changes: 1 addition & 10 deletions doc/src/content/xdocs/spec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -695,16 +695,7 @@
</p>
</section>
</section>
<section>
<title>Optional Codecs</title>
<section>
<title>snappy</title>
<p>The "snappy" codec uses
Google's <a href="http://code.google.com/p/snappy/">Snappy</a>
compression library. Each compressed block is followed
by its 4-byte, big-endian CRC32 checksum.</p>
</section>
</section>

</section>

<section>
Expand Down
46 changes: 4 additions & 42 deletions lang/c++/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,15 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BUILD_DIRECTORY})

project (Avro-cpp)

find_package (Boost 1.38 COMPONENTS regex filesystem system program_options)
find_package (Boost 1.38 COMPONENTS regex filesystem system)

include_directories (api ${BUILD_DIRECTORY})

add_library (avrocpp SHARED
add_library (avrocpp SHARED impl/Compiler.cc
impl/Compiler.cc impl/CompilerNode.cc impl/Node.cc
impl/NodeImpl.cc impl/Resolver.cc impl/ResolverSchema.cc impl/Schema.cc
impl/Types.cc impl/Validator.cc impl/ValidSchema.cc impl/Zigzag.cc
impl/BinaryEncoder.cc impl/BinaryDecoder.cc
impl/Stream.cc impl/FileStream.cc
impl/Generic.cc
impl/DataFile.cc
impl/parsing/Symbol.cc
impl/parsing/ValidatingCodec.cc
impl/parsing/JsonCodec.cc
Expand Down Expand Up @@ -83,34 +80,13 @@ add_custom_target (testgen2
add_custom_command (OUTPUT ${BUILD_DIRECTORY}/AvroYacc.cc
COMMAND bison --defines=AvroYacc.hh -o AvroYacc.cc ../parser/AvroYacc.yy
WORKING_DIRECTORY ${BUILD_DIRECTORY})

add_custom_command (OUTPUT ${BUILD_DIRECTORY}/AvroLex.cc
COMMAND flex -oAvroLex.cc ../parser/AvroLex.ll
WORKING_DIRECTORY ${BUILD_DIRECTORY})

add_custom_target (bigrecord_hh
COMMAND avrogencpp -i jsonschemas/bigrecord
-o ${BUILD_DIRECTORY}/bigrecord.hh -n testgen
DEPENDS avrogencpp)

add_custom_target (bigrecord2_hh
COMMAND avrogencpp -i jsonschemas/bigrecord2
-o ${BUILD_DIRECTORY}/bigrecord2.hh -n testgen2
DEPENDS avrogencpp)

add_custom_target (union_array_union_hh
COMMAND avrogencpp -i jsonschemas/union_array_union
-o ${BUILD_DIRECTORY}/union_array_union.hh -n uau
DEPENDS avrogencpp)

add_custom_target (union_map_union_hh
COMMAND avrogencpp -i jsonschemas/union_map_union
-o ${BUILD_DIRECTORY}/union_map_union.hh -n umu
DEPENDS avrogencpp)

macro (test name)
add_executable (${name} test/${name}.cc)
target_link_libraries (${name} avrocpp ${Boost_LIBRARIES})
target_link_libraries (${name} avrocpp boost_regex-mt)
endmacro (test)

test(buffertest)
Expand All @@ -122,23 +98,9 @@ target_link_libraries (CodecTests avrocpp ${Boost_LIBRARIES})
add_executable (StreamTests test/StreamTests.cc)
target_link_libraries (StreamTests avrocpp ${Boost_LIBRARIES})

add_executable (SpecificTests test/SpecificTests.cc)
target_link_libraries (SpecificTests avrocpp ${Boost_LIBRARIES})

add_executable (avrogencpp impl/avrogencpp.cc)
target_link_libraries (avrogencpp avrocpp ${Boost_LIBRARIES})

add_executable (testgentest test/testgen.cc)
add_dependencies (testgentest testgen testgen2)
target_link_libraries (testgentest avrocpp ${Boost_LIBRARIES})

add_executable (AvrogencppTests test/AvrogencppTests.cc)
add_dependencies (AvrogencppTests bigrecord_hh bigrecord2_hh
union_array_union_hh union_map_union_hh)
target_link_libraries (AvrogencppTests avrocpp ${BOOST_LIBRARIES})

add_executable (DataFileTests test/DataFileTests.cc)
target_link_libraries (DataFileTests avrocpp ${Boost_LIBRARIES})
target_link_libraries (testgentest avrocpp boost_regex-mt)

include (InstallRequiredSystemLibraries)

Expand Down
Empty file added lang/c++/Makefile.am
Empty file.
287 changes: 0 additions & 287 deletions lang/c++/api/DataFile.hh

This file was deleted.

Loading

0 comments on commit cb6560b

Please sign in to comment.