From ba9c06fc2beb817c6c146bc11ff3b72e9e9ec20c Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Thu, 5 Mar 2020 19:24:13 -0800
Subject: [PATCH] Move rapidjson submodule to aux directory

This also now installs the full rapidjson include/ tree in order to
allow external plugins to properly build if they include
threading/formatters/JSON.h
---
 .gitmodules                      | 3 +++
 CMakeLists.txt                   | 4 ++++
 aux/rapidjson                    | 1 +
 cmake                            | 2 +-
 src/3rdparty                     | 2 +-
 src/CMakeLists.txt               | 6 ------
 src/supervisor/Supervisor.cc     | 2 +-
 src/threading/formatters/JSON.cc | 2 +-
 src/threading/formatters/JSON.h  | 4 ++--
 9 files changed, 14 insertions(+), 12 deletions(-)
 create mode 160000 aux/rapidjson

diff --git a/.gitmodules b/.gitmodules
index 1bceead3d6..db2c32c686 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "aux/paraglob"]
 	path = aux/paraglob
 	url = https://github.com/zeek/paraglob
+[submodule "aux/rapidjson"]
+	path = aux/rapidjson
+	url = https://github.com/zeek/rapidjson
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fdc548b53..8297f588b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -263,6 +263,7 @@ endif ()
 set(zeekdeps ${zeekdeps} ${CAF_LIBRARIES})
 include_directories(BEFORE ${broker_includes} ${CAF_INCLUDE_DIRS})
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/paraglob/include)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include)
 include_directories(BEFORE
                     ${PCAP_INCLUDE_DIR}
                     ${BIND_INCLUDE_DIR}
@@ -271,6 +272,9 @@ include_directories(BEFORE
                     ${JEMALLOC_INCLUDE_DIR}
 )
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/aux/rapidjson/include/rapidjson
+        DESTINATION include/zeek/3rdparty/rapidjson/include)
+
 # Optional Dependencies
 
 set(USE_GEOIP false)
diff --git a/aux/rapidjson b/aux/rapidjson
new file mode 160000
index 0000000000..dfbe1db9da
--- /dev/null
+++ b/aux/rapidjson
@@ -0,0 +1 @@
+Subproject commit dfbe1db9da455552f7a9ad5d2aea17dd9d832ac1
diff --git a/cmake b/cmake
index 5174417e53..141030e593 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 5174417e539fb610074ee2367370bd6988bd2281
+Subproject commit 141030e593b03c1cb9879d713aa90a3b8b16f0f9
diff --git a/src/3rdparty b/src/3rdparty
index 1bbf93e602..731fd6de18 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 1bbf93e6027f686eda7ab7f36036cd1236c917fe
+Subproject commit 731fd6de1804ccee12fdef84a8b13d6f9718dc11
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23a36ff508..e0f01ccfc7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -427,12 +427,6 @@ install(FILES
         DESTINATION include/zeek/3rdparty
 )
 
-install(FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/rapidjson/include/rapidjson/document.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/rapidjson/include/rapidjson/writer.h
-        DESTINATION include/zeek/3rdparty/rapidjson/include/rapidjson
-)
-
 ########################################################################
 ## Clang-tidy target now that we have all of the sources
 
diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc
index 3d91725b26..b6a6068a46 100644
--- a/src/supervisor/Supervisor.cc
+++ b/src/supervisor/Supervisor.cc
@@ -29,7 +29,7 @@
 #include "zeek-affinity.h"
 
 #define RAPIDJSON_HAS_STDSTRING 1
-#include "3rdparty/rapidjson/include/rapidjson/document.h"
+#include "rapidjson/document.h"
 
 extern "C" {
 #include "setsignal.h"
diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc
index ad03aaf8a0..72b1624352 100644
--- a/src/threading/formatters/JSON.cc
+++ b/src/threading/formatters/JSON.cc
@@ -3,7 +3,7 @@
 #include "zeek-config.h"
 
 #include "JSON.h"
-#include "3rdparty/rapidjson/include/rapidjson/internal/ieee754.h"
+#include "rapidjson/internal/ieee754.h"
 #include "Desc.h"
 #include "threading/MsgThread.h"
 
diff --git a/src/threading/formatters/JSON.h b/src/threading/formatters/JSON.h
index 58aad5790d..74a002485a 100644
--- a/src/threading/formatters/JSON.h
+++ b/src/threading/formatters/JSON.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #define RAPIDJSON_HAS_STDSTRING 1
-#include "3rdparty/rapidjson/include/rapidjson/document.h"
-#include "3rdparty/rapidjson/include/rapidjson/writer.h"
+#include "rapidjson/document.h"
+#include "rapidjson/writer.h"
 
 #include "../Formatter.h"