Author: rhs
Date: Sat Oct 20 13:57:03 2012
New Revision: 1400452
URL: http://svn.apache.org/viewvc?rev=1400452&view=rev
Log:
applied PROTON-54 tweaked a bit; also removed outdated docs
Removed:
qpid/proton/trunk/proton-c/musings.txt
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/TODO
qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1400452&r1=1400451&r2=1400452&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Sat Oct 20 13:57:03 2012
@@ -13,6 +13,8 @@ set (ARCHLIBDIR lib CACHE STRING
set (LIBDIR ${CMAKE_INSTALL_PREFIX}/${ARCHLIBDIR})
set (INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
+set (PROTON_INSTALL_DATADIR share/proton CACHE STRING
+ "Directory to install read-only arch-independent data")
# Set the default SSL/TLS implementation
find_package(OpenSSL)
@@ -116,6 +118,10 @@ install (TARGETS proton proton-dump qpid
file(GLOB headers "include/proton/*.[hi]")
install (FILES ${headers} DESTINATION include/proton)
+# Install documentation files
+install (FILES LICENSE README TODO
+ DESTINATION ${PROTON_INSTALL_DATADIR})
+
# Pkg config file
configure_file(${PROJECT_SOURCE_DIR}/src/libqpid-proton.pc.in
Modified: qpid/proton/trunk/proton-c/TODO
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/TODO?rev=1400452&r1=1400451&r2=1400452&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/TODO (original)
+++ qpid/proton/trunk/proton-c/TODO Sat Oct 20 13:57:03 2012
@@ -1,8 +0,0 @@
- - fill in fake codecs
- - uuid, timestamp
- - tests: swig/python? mains?
- - eliminate exported structs
- - bug in driver when selectable set is modified from handler?
- - temporary failure in name reslution?
- - eliminate useless codegen in favor of a single reused arg list
- + finish this by adding stack thingy to engine for nested structures
Modified: qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt?rev=1400452&r1=1400451&r2=1400452&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt Sat Oct 20 13:57:03 2012
@@ -25,7 +25,7 @@ if (DOXYGEN_FOUND)
# HTML files are generated to ./html - put those in the install.
install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
- DESTINATION docs/api
+ DESTINATION ${PROTON_INSTALL_DATADIR}/docs/api
COMPONENT documentation
OPTIONAL)
# if (CPACK_GENERATOR STREQUAL "NSIS")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
