avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dcrea...@apache.org
Subject svn commit: r1129730 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/c/src/CMakeLists.txt lang/c/version.sh
Date Tue, 31 May 2011 15:01:29 GMT
Author: dcreager
Date: Tue May 31 15:01:29 2011
New Revision: 1129730

URL: http://svn.apache.org/viewvc?rev=1129730&view=rev
Log:
Merge -c 1129729 from trunk to 1.5.  Fixes: AVRO-469.

Modified:
    avro/branches/branch-1.5/   (props changed)
    avro/branches/branch-1.5/CHANGES.txt
    avro/branches/branch-1.5/lang/c/src/CMakeLists.txt
    avro/branches/branch-1.5/lang/c/version.sh

Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 15:01:29 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,1129697-1129706
+/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,1129729

Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1129730&r1=1129729&r2=1129730&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Tue May 31 15:01:29 2011
@@ -10,6 +10,9 @@ Avro 1.5.2 (unreleased)
 
   IMPROVEMENTS
 
+    AVRO-469. C: Set library's libtool-style soversion when using CMake
+    build scripts. (dcreager)
+
     AVRO-470. C: Build asciidoc documentation when using CMake build
     scripts. (Daniel Lundin via dcreager)
 

Modified: avro/branches/branch-1.5/lang/c/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/c/src/CMakeLists.txt?rev=1129730&r1=1129729&r2=1129730&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/c/src/CMakeLists.txt (original)
+++ avro/branches/branch-1.5/lang/c/src/CMakeLists.txt Tue May 31 15:01:29 2011
@@ -67,12 +67,17 @@ set(JANSSON_SRC
 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})
 set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro)
 add_library(avro-shared SHARED ${AVRO_SRC} ${JANSSON_SRC})
 set_target_properties(avro-shared PROPERTIES
         OUTPUT_NAME avro
-        SOVERSION ${AVRO_VERSION})
+        SOVERSION ${LIBAVRO_DOT_VERSION})
 
 install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/avro.h

Modified: avro/branches/branch-1.5/lang/c/version.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/c/version.sh?rev=1129730&r1=1129729&r2=1129730&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/c/version.sh (original)
+++ avro/branches/branch-1.5/lang/c/version.sh Tue May 31 15:01:29 2011
@@ -18,7 +18,7 @@
 #         libavro_binary_age = 0
 #         libavro_interface_age = 0
 #
-libavro_micro_version=21
+libavro_micro_version=22
 libavro_interface_age=0
 libavro_binary_age=0
 



Mime
View raw message