Merge pull request #45 from JohanMabille/isolation

Moved xauthentication.hpp and xzmq_serializer.hpp to src folder

CMakeLists.txt

@@ -123,7 +123,6 @@ find_package(OpenSSL REQUIRED)
 # ============
 
 set(XEUS_ZMQ_HEADERS
-    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xauthentication.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xclient_zmq.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xdap_tcp_client.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xdebugger_base.hpp
@@ -132,11 +131,11 @@ set(XEUS_ZMQ_HEADERS
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xserver_zmq.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xthread.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xzmq_context.hpp
-    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xzmq_serializer.hpp
 )
 
 set(XEUS_ZMQ_SOURCES
     ${XEUS_ZMQ_SOURCE_DIR}/xauthentication.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xauthentication.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.cpp
@@ -181,6 +180,7 @@ set(XEUS_ZMQ_SOURCES
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_messenger.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_messenger.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_serializer.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xzmq_serializer.hpp
 )
 
 # Targets and link

src/xauthentication.cpp

@@ -27,7 +27,7 @@
 #endif
 
 #include "xeus/xstring_utils.hpp"
-#include "xeus-zmq/xauthentication.hpp"
+#include "xauthentication.hpp"
 
 namespace xeus
 {

include/xeus-zmq/xauthentication.hpp → src/xauthentication.hpp

@@ -13,11 +13,9 @@
 #include <memory>
 #include <string>
 
-#include "xeus-zmq.hpp"
-
 namespace xeus
 {
-    class XEUS_ZMQ_API xraw_buffer
+    class xraw_buffer
     {
     public:
 
@@ -33,7 +31,7 @@ namespace xeus
         size_t m_size;
     };
 
-    class XEUS_ZMQ_API xauthentication
+    class xauthentication
     {
     public:
 
@@ -74,7 +72,6 @@ namespace xeus
                                  const xraw_buffer& content) const = 0;
     };
 
-    XEUS_ZMQ_API
     std::unique_ptr<xauthentication> make_xauthentication(const std::string& scheme,
                                                           const std::string& key);
 }

src/xclient_zmq_impl.cpp

@@ -9,9 +9,9 @@
 
 #include <iostream>
 
-#include "xeus-zmq/xauthentication.hpp"
+#include "xauthentication.hpp"
 #include "xclient_zmq_impl.hpp"
-#include "xeus-zmq/xzmq_serializer.hpp"
+#include "xzmq_serializer.hpp"
 
 namespace xeus
 {

src/xdap_tcp_client.cpp

@@ -10,9 +10,9 @@
 #include "zmq_addon.hpp"
 #include "nlohmann/json.hpp"
 #include "xeus/xmessage.hpp"
-#include "xeus-zmq/xzmq_serializer.hpp"
 #include "xeus-zmq/xdap_tcp_client.hpp"
 #include "xdap_tcp_client_impl.hpp"
+#include "xzmq_serializer.hpp"
 
 namespace xeus
 {

src/xdap_tcp_client_impl.cpp

@@ -10,8 +10,8 @@
 #include "zmq_addon.hpp"
 #include "nlohmann/json.hpp"
 #include "xeus/xmessage.hpp"
-#include "xeus-zmq/xzmq_serializer.hpp"
 #include "xdap_tcp_client_impl.hpp"
+#include "xzmq_serializer.hpp"
 
 namespace xeus
 {

src/xdap_tcp_client_impl.hpp

@@ -18,8 +18,8 @@
 #include "xeus/xkernel_configuration.hpp"
 #include "xeus/xeus_context.hpp"
 
-#include "xeus-zmq/xauthentication.hpp"
 #include "xeus-zmq/xdap_tcp_client.hpp"
+#include "xauthentication.hpp"
 
 namespace nl = nlohmann;
 

src/xiopub_client.cpp

@@ -9,11 +9,10 @@
 
 #include <iostream>
 
-#include "xeus-zmq/xzmq_serializer.hpp"
-
 #include "xiopub_client.hpp"
 #include "xclient_zmq_impl.hpp"
 #include "xmiddleware_impl.hpp"
+#include "xzmq_serializer.hpp"
 
 namespace xeus
 {

src/xserver_zmq_default.cpp

@@ -11,8 +11,8 @@
 #include <iostream>
 
 #include "xeus/xguid.hpp"
-#include "xeus-zmq/xauthentication.hpp"
-#include "xeus-zmq/xzmq_serializer.hpp"
+#include "xauthentication.hpp"
+#include "xzmq_serializer.hpp"
 #include "xserver_zmq_default.hpp"
 #include "xmiddleware_impl.hpp"
 #include "xpublisher.hpp"

src/xserver_zmq_split.cpp

@@ -12,9 +12,9 @@
 
 #include "zmq_addon.hpp"
 #include "xeus/xguid.hpp"
-#include "xeus-zmq/xauthentication.hpp"
 #include "xeus-zmq/xmiddleware.hpp"
-#include "xeus-zmq/xzmq_serializer.hpp"
+#include "xauthentication.hpp"
+#include "xzmq_serializer.hpp"
 #include "xserver_zmq_split.hpp"
 #include "xcontrol.hpp"
 #include "xheartbeat.hpp"

src/xzmq_serializer.cpp

@@ -7,7 +7,7 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-#include "xeus-zmq/xzmq_serializer.hpp"
+#include "xzmq_serializer.hpp"
 
 namespace xeus
 {

include/xeus-zmq/xzmq_serializer.hpp → src/xzmq_serializer.hpp

@@ -14,12 +14,11 @@
 
 #include "xeus/xmessage.hpp"
 
-#include "xeus-zmq.hpp"
 #include "xauthentication.hpp"
 
 namespace xeus
 {
-    class XEUS_ZMQ_API xzmq_serializer
+    class xzmq_serializer
     {
     public:
 

test/CMakeLists.txt

@@ -163,7 +163,9 @@ set_tests_properties(test_kernel_shell
     PROPERTIES
     ENVIRONMENT "JUPYTER_PATH=${CMAKE_CURRENT_BINARY_DIR}")
 
-if (UNIX)
+# TODO: enable this again when the ipc client 
+# is implemented
+if (FALSE)
 
     # Test_kernel_ipc
     # ===============

test/client_ipc.cpp

@@ -6,7 +6,12 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
-#include <iostream>
+// TODO: this client should be reimplemented with
+// the new client framework. Notice that it was not
+// tested in the CI but was here for trying to reproduce
+// some issue with IPC.
+
+/*#include <iostream>
 
 #include "zmq_addon.hpp"
 #include "nlohmann/json.hpp"
@@ -53,5 +58,5 @@ int main(int, char**)
     std::cout << resp.content().dump(4) << std::endl;
 
     return 0;
-}
+}*/