QPID-2708: Create a separate qpidtypes library for the types namespace.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@959419 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 47 insertions, 23 deletions

diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 8bf1178237..df4081ea49 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -496,6 +496,13 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
     set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
   endif (MSVC)
 
+  set (qpidtypes_platform_SOURCES
+    qpid/sys/windows/uuid.cpp
+  )
+  set (qpidtypes_platform_LIBS
+    rpcrt4
+  )
+
   set (qpidcommon_platform_SOURCES
     qpid/log/windows/SinkOptions.cpp
     qpid/sys/windows/AsynchIO.cpp
@@ -512,11 +519,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
     qpid/sys/windows/SystemInfo.cpp
     qpid/sys/windows/Thread.cpp
     qpid/sys/windows/Time.cpp
-    qpid/sys/windows/uuid.cpp
     ${sslcommon_windows_SOURCES}
   )
+
   set (qpidcommon_platform_LIBS
-    ${windows_ssl_libs} rpcrt4 ws2_32
+    ${windows_ssl_libs} ws2_32
   )
   set (qpidbroker_platform_SOURCES
     qpid/broker/windows/BrokerDefaults.cpp
@@ -559,6 +566,11 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
     )
   endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
 
+  set (qpidtypes_platform_SOURCES)
+  set (qpidtypes_platform_LIBS
+    uuid
+  )
+
   set (qpidcommon_platform_SOURCES
     qpid/sys/posix/AsynchIO.cpp
     qpid/sys/posix/Fork.cpp
@@ -581,7 +593,6 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
   set (qpidcommon_platform_LIBS
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}
-    uuid
     ${CMAKE_DL_LIBS}
   )
 
@@ -662,9 +673,6 @@ set (qpidcommon_SOURCES
      qpid/sys/Runnable.cpp
      qpid/sys/Shlib.cpp
      qpid/sys/Timer.cpp
-     qpid/types/Exception.cpp
-     qpid/types/Uuid.cpp
-     qpid/types/Variant.cpp
      qpid/amqp_0_10/Codecs.cpp
 )
 
@@ -672,7 +680,7 @@ add_library (qpidcommon SHARED ${qpidcommon_SOURCES})
 if (CLOCK_GETTIME_IN_RT)
   set (qpidcommon_platform_LIBS ${qpidcommon_platform_LIBS} rt)
 endif (CLOCK_GETTIME_IN_RT)
-target_link_libraries (qpidcommon
+target_link_libraries (qpidcommon qpidtypes
                        ${qpidcommon_platform_LIBS}
                        ${qpidcommon_sasl_lib})
 set_target_properties (qpidcommon PROPERTIES
@@ -682,6 +690,18 @@ install (TARGETS qpidcommon
          COMPONENT ${QPID_COMPONENT_COMMON})
 install_pdb (qpidcommon ${QPID_COMPONENT_COMMON})
 
+set(qpidtypes_SOURCES
+  qpid/types/Exception.cpp
+  qpid/types/Uuid.cpp
+  qpid/types/Variant.cpp
+  ${qpidtypes_platform_SOURCES}
+)
+add_library(qpidtypes SHARED ${qpidtypes_SOURCES})
+target_link_libraries(qpidtypes ${qpidtypes_platform_LIBS})
+set_target_properties (qpidtypes PROPERTIES VERSION ${qpidc_version})
+install(TARGETS qpidtypes
+  DESTINATION ${QPID_INSTALL_LIBDIR}
+  COMPONENT ${QPID_COMPONENT_COMMON})
 
 set (qpidclient_SOURCES
      ${rgen_client_srcs}
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 30df5a1da2..abfaffbd74 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -185,7 +185,7 @@ libqpidcommon_la_SOURCES += $(poller) $(systeminfo)
 posix_broker_src = \
   qpid/broker/posix/BrokerDefaults.cpp
 
-lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la
+lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la libqpidtypes.la
 
 # Definitions for client and daemon plugins
 PLUGINLDFLAGS=-no-undefined -module -avoid-version
@@ -309,6 +309,7 @@ EXTRA_DIST +=\
   qpid/store
 
 libqpidcommon_la_LIBADD = \
+  libqpidtypes.la \
   -lboost_program_options \
   -lboost_filesystem \
   -luuid \
@@ -477,10 +478,7 @@ libqpidcommon_la_SOURCES +=			\
   qpid/sys/Waitable.h				\
   qpid/sys/alloca.h				\
   qpid/sys/uuid.h				\
-  qpid/amqp_0_10/Codecs.cpp			\
-  qpid/types/Exception.cpp			\
-  qpid/types/Uuid.cpp				\
-  qpid/types/Variant.cpp
+  qpid/amqp_0_10/Codecs.cpp
 
 if HAVE_SASL
 libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
@@ -491,8 +489,7 @@ endif
 QPIDCOMMON_VERSION_INFO = 2:0:0
 libqpidcommon_la_LDFLAGS=-version-info $(QPIDCOMMON_VERSION_INFO)
 
-libqpidbroker_la_LIBADD = libqpidcommon.la -luuid
-
+libqpidbroker_la_LIBADD = libqpidcommon.la
 libqpidbroker_la_SOURCES = \
   $(mgen_broker_cpp) \
   $(posix_broker_src) \
@@ -714,8 +711,15 @@ libqpidclient_la_SOURCES =			\
 QPIDCLIENT_VERSION_INFO  = 2:0:0
 libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO)
 
-libqpidmessaging_la_LIBADD = libqpidclient.la
+libqpidtypes_la_libadd=-luuid
+libqpidtypes_la_SOURCES=			\
+  qpid/types/Exception.cpp			\
+  qpid/types/Uuid.cpp				\
+  qpid/types/Variant.cpp
+QPIDTYPES_VERSION_INFO  = 1:0:0
+libqpidtypes_la_LDFLAGS = -version-info $(QPIDTYPES_VERSION_INFO)
 
+libqpidmessaging_la_LIBADD = libqpidclient.la libqpidtypes.la
 libqpidmessaging_la_SOURCES =			\
   qpid/messaging/Address.cpp			\
   qpid/messaging/AddressParser.h		\
diff --git a/cpp/src/qpid/sys/windows/uuid.h b/cpp/src/qpid/sys/windows/uuid.h
index 9c32814182..8ab132e9ce 100644
--- a/cpp/src/qpid/sys/windows/uuid.h
+++ b/cpp/src/qpid/sys/windows/uuid.h
@@ -22,18 +22,18 @@
  *
  */
 
-#include "qpid/CommonImportExport.h"
+#include "qpid/types/ImportExport.h"
 #include <qpid/sys/IntegerTypes.h>
 
 namespace qpid { namespace sys { const size_t UuidSize = 16; }}
 typedef uint8_t uuid_t[qpid::sys::UuidSize];
 
-QPID_COMMON_EXTERN void uuid_clear (uuid_t uu);
-QPID_COMMON_EXTERN void uuid_copy (uuid_t dst, const uuid_t src);
-QPID_COMMON_EXTERN void uuid_generate (uuid_t out);
-QPID_COMMON_EXTERN int  uuid_is_null (const uuid_t uu);          // Returns 1 if null, else 0
-QPID_COMMON_EXTERN int  uuid_parse (const char *in, uuid_t uu);  // Returns 0 on success, else -1
-QPID_COMMON_EXTERN void uuid_unparse (const uuid_t uu, char *out);
-QPID_COMMON_EXTERN int  uuid_compare (const uuid_t a, const uuid_t b);
+QPID_TYPES_EXTERN void uuid_clear (uuid_t uu);
+QPID_TYPES_EXTERN void uuid_copy (uuid_t dst, const uuid_t src);
+QPID_TYPES_EXTERN void uuid_generate (uuid_t out);
+QPID_TYPES_EXTERN int  uuid_is_null (const uuid_t uu);          // Returns 1 if null, else 0
+QPID_TYPES_EXTERN int  uuid_parse (const char *in, uuid_t uu);  // Returns 0 on success, else -1
+QPID_TYPES_EXTERN void uuid_unparse (const uuid_t uu, char *out);
+QPID_TYPES_EXTERN int  uuid_compare (const uuid_t a, const uuid_t b);
 
 #endif  /*!_sys_windows_uuid_h*/