You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by dc...@apache.org on 2011/05/31 16:41:44 UTC
svn commit: r1129707 - in /avro/branches/branch-1.5: ./ CHANGES.txt
lang/c/CMakeLists.txt lang/c/docs/CMakeLists.txt
Author: dcreager
Date: Tue May 31 14:41:44 2011
New Revision: 1129707
URL: http://svn.apache.org/viewvc?rev=1129707&view=rev
Log:
Merge 1129697 and 1129705 from trunk to 1.5. Fixes: AVRO-470.
Added:
avro/branches/branch-1.5/lang/c/docs/CMakeLists.txt
- copied unchanged from r1129706, avro/trunk/lang/c/docs/CMakeLists.txt
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/c/CMakeLists.txt
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 14:41:44 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1102332,1102335,1124127,1124971,1129053,1129071
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968,1097974,1102332,1102335,1124127,1124971,1129053,1129071,1129697-1129706
Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1129707&r1=1129706&r2=1129707&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Tue May 31 14:41:44 2011
@@ -10,6 +10,9 @@ Avro 1.5.2 (unreleased)
IMPROVEMENTS
+ AVRO-470. C: Build asciidoc documentation when using CMake build
+ scripts. (Daniel Lundin via dcreager)
+
AVRO-820. Java: Permit applications to catch exceptions thrown
while writing data to a file and then continue writing to that
file. (scottcarey & cutting)
Modified: avro/branches/branch-1.5/lang/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/c/CMakeLists.txt?rev=1129707&r1=1129706&r2=1129707&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/c/CMakeLists.txt (original)
+++ avro/branches/branch-1.5/lang/c/CMakeLists.txt Tue May 31 14:41:44 2011
@@ -19,7 +19,28 @@
cmake_minimum_required(VERSION 2.4)
project(AvroC)
enable_testing()
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../share/VERSION.txt" AVRO_VERSION)
+
+#-----------------------------------------------------------------------
+# Retrieve the current version number
+
+execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/version.sh project
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ RESULT_VARIABLE AVRO_VERSION_RESULT
+ OUTPUT_VARIABLE AVRO_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(AVRO_VERSION_RESULT)
+ message(FATAL_ERROR "Cannot determine Avro version number")
+endif(AVRO_VERSION_RESULT)
+
+execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/version.sh libtool
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ RESULT_VARIABLE LIBAVRO_VERSION_RESULT
+ OUTPUT_VARIABLE LIBAVRO_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(LIBAVRO_VERSION_RESULT)
+ message(FATAL_ERROR "Cannot determine libavro version number")
+endif(LIBAVRO_VERSION_RESULT)
+
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" CACHE STRING "Build architectures for Mac OS X" FORCE)
@@ -35,6 +56,7 @@ include_directories(${AvroC_SOURCE_DIR}/
add_subdirectory(src)
add_subdirectory(examples)
add_subdirectory(tests)
+add_subdirectory(docs)
add_custom_target(pretty
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake_pretty.cmake")