Move headers to include/xmlrpcpp (ros#962)

* Move headers to include/xmlrpcpp * Export old include dir for compatibility
clearpathrobotics · Jan 26, 2017 · 54a2d9d · 54a2d9d
1 parent fa5fb83
commit 54a2d9d
Show file tree

Hide file tree

Showing 50 changed files with 81 additions and 78 deletions.
diff --git a/clients/roscpp/include/ros/master.h b/clients/roscpp/include/ros/master.h
@@ -29,7 +29,7 @@
 #define ROSCPP_MASTER_H
 
 #include "forwards.h"
-#include "XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcValue.h"
 #include "common.h"
 
 namespace ros

diff --git a/clients/roscpp/include/ros/node_handle.h b/clients/roscpp/include/ros/node_handle.h
@@ -48,7 +48,7 @@
 
 #include <boost/bind.hpp>
 
-#include <XmlRpcValue.h>
+#include <xmlrpcpp/XmlRpcValue.h>
 
 namespace ros
 {

diff --git a/clients/roscpp/include/ros/param.h b/clients/roscpp/include/ros/param.h
@@ -30,7 +30,7 @@
 
 #include "forwards.h"
 #include "common.h"
-#include "XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcValue.h"
 
 #include <vector>
 #include <map>

diff --git a/clients/roscpp/include/ros/publication.h b/clients/roscpp/include/ros/publication.h
@@ -31,7 +31,7 @@
 #include "ros/forwards.h"
 #include "ros/advertise_options.h"
 #include "common.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <boost/thread/mutex.hpp>
 

diff --git a/clients/roscpp/include/ros/service_publication.h b/clients/roscpp/include/ros/service_publication.h
@@ -30,7 +30,7 @@
 
 #include "ros/service_callback_helper.h"
 #include "common.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <boost/thread/mutex.hpp>
 

diff --git a/clients/roscpp/include/ros/subscription.h b/clients/roscpp/include/ros/subscription.h
@@ -35,7 +35,7 @@
 #include "ros/transport_hints.h"
 #include "ros/xmlrpc_manager.h"
 #include "ros/statistics.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/clients/roscpp/include/ros/topic_manager.h b/clients/roscpp/include/ros/topic_manager.h
@@ -33,7 +33,7 @@
 #include "ros/serialization.h"
 #include "rosout_appender.h"
 
-#include "XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcValue.h"
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>

diff --git a/clients/roscpp/include/ros/xmlrpc_manager.h b/clients/roscpp/include/ros/xmlrpc_manager.h
@@ -36,7 +36,7 @@
 #include <boost/enable_shared_from_this.hpp>
 
 #include "common.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <ros/time.h>
 

diff --git a/clients/roscpp/src/libros/init.cpp b/clients/roscpp/src/libros/init.cpp
@@ -48,7 +48,7 @@
 #include "ros/subscribe_options.h"
 #include "ros/transport/transport_tcp.h"
 #include "ros/internal_timer_manager.h"
-#include "XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
 
 #include "roscpp/GetLoggers.h"
 #include "roscpp/SetLoggerLevel.h"

diff --git a/clients/roscpp/src/libros/master.cpp b/clients/roscpp/src/libros/master.cpp
@@ -34,7 +34,7 @@
 #include <ros/console.h>
 #include <ros/assert.h>
 
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 namespace ros
 {

diff --git a/clients/roscpp/src/libros/node_handle.cpp b/clients/roscpp/src/libros/node_handle.cpp
@@ -42,7 +42,7 @@
 #include "ros/names.h"
 #include "ros/init.h"
 #include "ros/this_node.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <boost/thread.hpp>
 

diff --git a/clients/roscpp/src/libros/service_manager.cpp b/clients/roscpp/src/libros/service_manager.cpp
@@ -42,7 +42,7 @@
 #include "ros/connection.h"
 #include "ros/file_log.h"
 
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <ros/console.h>
 

diff --git a/clients/roscpp/src/libros/topic_manager.cpp b/clients/roscpp/src/libros/topic_manager.cpp
@@ -41,7 +41,7 @@
 #include "ros/file_log.h"
 #include "ros/subscribe_options.h"
 
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <ros/console.h>
 

diff --git a/test/test_roscpp/test/src/check_master.cpp b/test/test_roscpp/test/src/check_master.cpp
@@ -40,7 +40,7 @@
 
 #include "ros/ros.h"
 
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 using namespace XmlRpc;
 

diff --git a/tools/rosbag/src/recorder.cpp b/tools/rosbag/src/recorder.cpp
@@ -60,7 +60,7 @@
 
 #include "ros/network.h"
 #include "ros/xmlrpc_manager.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #define foreach BOOST_FOREACH
 

diff --git a/utilities/xmlrpcpp/CMakeLists.txt b/utilities/xmlrpcpp/CMakeLists.txt
@@ -6,10 +6,13 @@ if(NOT WIN32)
 endif()
 
 find_package(catkin REQUIRED COMPONENTS cpp_common)
+
+# The CFG_EXTRAS is only for compatibility, to be removed in Lunar.
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES xmlrpcpp
   CATKIN_DEPENDS cpp_common
+  CFG_EXTRAS xmlrpcpp-extras.cmake
 )
 
 include_directories(include ${catkin_INCLUDE_DIRS})
@@ -35,8 +38,7 @@ if(WIN32)
   target_link_libraries(xmlrpcpp ws2_32)
 endif()
 
-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility
-install(DIRECTORY include/
+install(DIRECTORY include/${PROJECT_NAME}
   DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
   FILES_MATCHING PATTERN "*.h")
 

diff --git a/utilities/xmlrpcpp/cmake/xmlrpcpp-extras.cmake.in b/utilities/xmlrpcpp/cmake/xmlrpcpp-extras.cmake.in
@@ -0,0 +1 @@
+list(APPEND @PROJECT_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/../../../@CATKIN_GLOBAL_INCLUDE_DESTINATION@/xmlrpcpp")
diff --git a/utilities/xmlrpcpp/include/XmlRpc.h → utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h b/utilities/xmlrpcpp/include/XmlRpc.h → utilities/xmlrpcpp/include/xmlrpcpp/XmlRpc.h
@@ -27,12 +27,12 @@
 # include <string>
 #endif
 
-#include "XmlRpcClient.h"
-#include "XmlRpcException.h"
-#include "XmlRpcServer.h"
-#include "XmlRpcServerMethod.h"
-#include "XmlRpcValue.h"
-#include "XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcClient.h"
+#include "xmlrpcpp/XmlRpcException.h"
+#include "xmlrpcpp/XmlRpcServer.h"
+#include "xmlrpcpp/XmlRpcServerMethod.h"
+#include "xmlrpcpp/XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
 
 #include <stdexcept>
 

diff --git a/utilities/xmlrpcpp/include/XmlRpcClient.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcClient.h b/utilities/xmlrpcpp/include/XmlRpcClient.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcClient.h
@@ -13,9 +13,9 @@
 # include <string>
 #endif
 
-#include "XmlRpcDispatch.h"
-#include "XmlRpcSource.h"
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "xmlrpcpp/XmlRpcSource.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 namespace XmlRpc {
 

diff --git a/utilities/xmlrpcpp/include/XmlRpcDecl.h → ...es/xmlrpcpp/include/xmlrpcpp/XmlRpcDecl.h b/utilities/xmlrpcpp/include/XmlRpcDecl.h → ...es/xmlrpcpp/include/xmlrpcpp/XmlRpcDecl.h
diff --git a/utilities/xmlrpcpp/include/XmlRpcDispatch.h → ...mlrpcpp/include/xmlrpcpp/XmlRpcDispatch.h b/utilities/xmlrpcpp/include/XmlRpcDispatch.h → ...mlrpcpp/include/xmlrpcpp/XmlRpcDispatch.h
@@ -8,7 +8,7 @@
 # pragma warning(disable:4786)    // identifier was truncated in debug info
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 #ifndef MAKEDEPEND
 # include <list>

diff --git a/utilities/xmlrpcpp/include/XmlRpcException.h → ...lrpcpp/include/xmlrpcpp/XmlRpcException.h b/utilities/xmlrpcpp/include/XmlRpcException.h → ...lrpcpp/include/xmlrpcpp/XmlRpcException.h
@@ -12,7 +12,7 @@
 # include <string>
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 
 namespace XmlRpc {

diff --git a/utilities/xmlrpcpp/include/XmlRpcServer.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h b/utilities/xmlrpcpp/include/XmlRpcServer.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
@@ -16,9 +16,9 @@
 # include <string>
 #endif
 
-#include "XmlRpcDispatch.h"
-#include "XmlRpcSource.h"
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "xmlrpcpp/XmlRpcSource.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 namespace XmlRpc {
 

diff --git a/...xmlrpcpp/include/XmlRpcServerConnection.h → ...include/xmlrpcpp/XmlRpcServerConnection.h b/...xmlrpcpp/include/XmlRpcServerConnection.h → ...include/xmlrpcpp/XmlRpcServerConnection.h
@@ -11,9 +11,9 @@
 # include <string>
 #endif
 
-#include "XmlRpcValue.h"
-#include "XmlRpcSource.h"
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcSource.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 namespace XmlRpc {
 

diff --git a/...ies/xmlrpcpp/include/XmlRpcServerMethod.h → ...cpp/include/xmlrpcpp/XmlRpcServerMethod.h b/...ies/xmlrpcpp/include/XmlRpcServerMethod.h → ...cpp/include/xmlrpcpp/XmlRpcServerMethod.h
@@ -8,7 +8,7 @@
 # pragma warning(disable:4786)    // identifier was truncated in debug info
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 #ifndef MAKEDEPEND
 # include <string>

diff --git a/utilities/xmlrpcpp/include/XmlRpcSocket.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcSocket.h b/utilities/xmlrpcpp/include/XmlRpcSocket.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcSocket.h
@@ -15,7 +15,7 @@
 # include <string>
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 namespace XmlRpc {
 

diff --git a/utilities/xmlrpcpp/include/XmlRpcSource.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcSource.h b/utilities/xmlrpcpp/include/XmlRpcSource.h → .../xmlrpcpp/include/xmlrpcpp/XmlRpcSource.h
@@ -8,7 +8,7 @@
 # pragma warning(disable:4786)    // identifier was truncated in debug info
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 namespace XmlRpc {
 

diff --git a/utilities/xmlrpcpp/include/XmlRpcUtil.h → ...es/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h b/utilities/xmlrpcpp/include/XmlRpcUtil.h → ...es/xmlrpcpp/include/xmlrpcpp/XmlRpcUtil.h
@@ -11,7 +11,7 @@
 # include <string>
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 #if defined(_MSC_VER)
 # define snprintf	    _snprintf_s

diff --git a/utilities/xmlrpcpp/include/XmlRpcValue.h → ...s/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h b/utilities/xmlrpcpp/include/XmlRpcValue.h → ...s/xmlrpcpp/include/xmlrpcpp/XmlRpcValue.h
@@ -8,7 +8,7 @@
 # pragma warning(disable:4786)    // identifier was truncated in debug info
 #endif
 
-#include "XmlRpcDecl.h"
+#include "xmlrpcpp/XmlRpcDecl.h"
 
 #ifndef MAKEDEPEND
 # include <map>

diff --git a/utilities/xmlrpcpp/include/base64.h → utilities/xmlrpcpp/include/xmlrpcpp/base64.h b/utilities/xmlrpcpp/include/base64.h → utilities/xmlrpcpp/include/xmlrpcpp/base64.h
diff --git a/utilities/xmlrpcpp/src/XmlRpcClient.cpp b/utilities/xmlrpcpp/src/XmlRpcClient.cpp
@@ -1,8 +1,8 @@
 
-#include "XmlRpcClient.h"
+#include "xmlrpcpp/XmlRpcClient.h"
 
-#include "XmlRpcSocket.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp b/utilities/xmlrpcpp/src/XmlRpcDispatch.cpp
@@ -1,7 +1,7 @@
 
-#include "XmlRpcDispatch.h"
-#include "XmlRpcSource.h"
-#include "XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcDispatch.h"
+#include "xmlrpcpp/XmlRpcSource.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
 
 #include <math.h>
 #include <errno.h>

diff --git a/utilities/xmlrpcpp/src/XmlRpcServer.cpp b/utilities/xmlrpcpp/src/XmlRpcServer.cpp
@@ -2,12 +2,12 @@
 // added features: server can be opened on port 0 and you can read back
 // what port the OS gave you
 
-#include "XmlRpcServer.h"
-#include "XmlRpcServerConnection.h"
-#include "XmlRpcServerMethod.h"
-#include "XmlRpcSocket.h"
-#include "XmlRpcUtil.h"
-#include "XmlRpcException.h"
+#include "xmlrpcpp/XmlRpcServer.h"
+#include "xmlrpcpp/XmlRpcServerConnection.h"
+#include "xmlrpcpp/XmlRpcServerMethod.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcException.h"
 
 
 using namespace XmlRpc;

diff --git a/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp b/utilities/xmlrpcpp/src/XmlRpcServerConnection.cpp
@@ -1,8 +1,8 @@
 
-#include "XmlRpcServerConnection.h"
+#include "xmlrpcpp/XmlRpcServerConnection.h"
 
-#include "XmlRpcSocket.h"
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpc.h"
 #ifndef MAKEDEPEND
 # include <stdio.h>
 # include <stdlib.h>

diff --git a/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp b/utilities/xmlrpcpp/src/XmlRpcServerMethod.cpp
@@ -1,6 +1,6 @@
 
-#include "XmlRpcServerMethod.h"
-#include "XmlRpcServer.h"
+#include "xmlrpcpp/XmlRpcServerMethod.h"
+#include "xmlrpcpp/XmlRpcServer.h"
 
 namespace XmlRpc {
 

diff --git a/utilities/xmlrpcpp/src/XmlRpcSocket.cpp b/utilities/xmlrpcpp/src/XmlRpcSocket.cpp
@@ -2,8 +2,8 @@
 // added features: server can be opened on port 0 and you can read back
 // what port the OS gave you
 
-#include "XmlRpcSocket.h"
-#include "XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
 
 #ifndef MAKEDEPEND
 

diff --git a/utilities/xmlrpcpp/src/XmlRpcSource.cpp b/utilities/xmlrpcpp/src/XmlRpcSource.cpp
@@ -1,7 +1,7 @@
 
-#include "XmlRpcSource.h"
-#include "XmlRpcSocket.h"
-#include "XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcSource.h"
+#include "xmlrpcpp/XmlRpcSocket.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
 
 namespace XmlRpc {
 

diff --git a/utilities/xmlrpcpp/src/XmlRpcUtil.cpp b/utilities/xmlrpcpp/src/XmlRpcUtil.cpp
@@ -1,5 +1,5 @@
 
-#include "XmlRpcUtil.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
 
 #ifndef MAKEDEPEND
 # include <ctype.h>
@@ -9,7 +9,7 @@
 # include <string.h>
 #endif
 
-#include "XmlRpc.h"
+#include "xmlrpcpp/XmlRpc.h"
 
 using namespace XmlRpc;
 

diff --git a/utilities/xmlrpcpp/src/XmlRpcValue.cpp b/utilities/xmlrpcpp/src/XmlRpcValue.cpp
@@ -1,8 +1,8 @@
 
-#include "XmlRpcValue.h"
-#include "XmlRpcException.h"
-#include "XmlRpcUtil.h"
-#include "base64.h"
+#include "xmlrpcpp/XmlRpcValue.h"
+#include "xmlrpcpp/XmlRpcException.h"
+#include "xmlrpcpp/XmlRpcUtil.h"
+#include "xmlrpcpp/base64.h"
 
 #ifndef MAKEDEPEND
 # include <iostream>