From 45ef458af4b39e39438a03f88749cba3258e0c37 Mon Sep 17 00:00:00 2001
From: Heather Anderson <heath@odysseus.anderson.name>
Date: Tue, 31 Aug 2021 20:43:22 -0700
Subject: [PATCH] dropping dependencies from networking to script-engine by
 moving EntityScriptClient and LocationScriptingInterface

---
 libraries/networking/CMakeLists.txt                    |  1 -
 .../src/EntityScriptClient.cpp                         |  4 ++--
 .../src/EntityScriptClient.h                           | 10 +++++-----
 .../src/LocationScriptingInterface.cpp                 | 10 +++++-----
 .../src/LocationScriptingInterface.h                   |  2 +-
 plugins/hifiSdl2/CMakeLists.txt                        |  1 -
 6 files changed, 13 insertions(+), 15 deletions(-)
 rename libraries/{networking => script-engine}/src/EntityScriptClient.cpp (99%)
 rename libraries/{networking => script-engine}/src/EntityScriptClient.h (94%)
 rename libraries/{networking => script-engine}/src/LocationScriptingInterface.cpp (89%)
 rename libraries/{networking => script-engine}/src/LocationScriptingInterface.h (96%)

diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 29c92f1df6..c635059d1b 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(TARGET_NAME networking)
 setup_hifi_library(Network WebSockets)
 link_hifi_libraries(shared platform)
-include_hifi_library_headers(script-engine)
 
 target_openssl()
 target_tbb()
diff --git a/libraries/networking/src/EntityScriptClient.cpp b/libraries/script-engine/src/EntityScriptClient.cpp
similarity index 99%
rename from libraries/networking/src/EntityScriptClient.cpp
rename to libraries/script-engine/src/EntityScriptClient.cpp
index fb98e8042b..93406da953 100644
--- a/libraries/networking/src/EntityScriptClient.cpp
+++ b/libraries/script-engine/src/EntityScriptClient.cpp
@@ -1,6 +1,6 @@
 #include "EntityScriptClient.h"
-#include "NodeList.h"
-#include "NetworkLogging.h"
+#include <NodeList.h>
+#include <NetworkLogging.h>
 #include "EntityScriptUtils.h"
 
 #include <QThread>
diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/script-engine/src/EntityScriptClient.h
similarity index 94%
rename from libraries/networking/src/EntityScriptClient.h
rename to libraries/script-engine/src/EntityScriptClient.h
index 1fddc6b976..e8eedbb9d0 100644
--- a/libraries/networking/src/EntityScriptClient.h
+++ b/libraries/script-engine/src/EntityScriptClient.h
@@ -1,6 +1,6 @@
 //
 //  EntityScriptClient.h
-//  libraries/networking/src
+//  libraries/script-engine/src
 //
 //  Created by Ryan Huffman on 2017/01/13
 //  Copyright 2017 High Fidelity, Inc.
@@ -14,10 +14,10 @@
 
 #include <QtCore/QSharedPointer>
 
-#include "ClientServerUtils.h"
-#include "LimitedNodeList.h"
-#include "ReceivedMessage.h"
-#include "AssetUtils.h"
+#include <ClientServerUtils.h>
+#include <LimitedNodeList.h>
+#include <ReceivedMessage.h>
+#include <AssetUtils.h>
 #include "EntityScriptUtils.h"
 
 #include <DependencyManager.h>
diff --git a/libraries/networking/src/LocationScriptingInterface.cpp b/libraries/script-engine/src/LocationScriptingInterface.cpp
similarity index 89%
rename from libraries/networking/src/LocationScriptingInterface.cpp
rename to libraries/script-engine/src/LocationScriptingInterface.cpp
index 23884cab1e..466ac779da 100644
--- a/libraries/networking/src/LocationScriptingInterface.cpp
+++ b/libraries/script-engine/src/LocationScriptingInterface.cpp
@@ -1,6 +1,6 @@
 //
 //  LocationScriptingInterface.cpp
-//  libraries/networking/src
+//  libraries/script-engine/src
 //
 //  Created by Ryan Huffman on 4/29/14.
 //  Copyright 2014 High Fidelity, Inc.
@@ -11,10 +11,10 @@
 
 #include "LocationScriptingInterface.h"
 
-#include "AddressManager.h"
-#include <ScriptContext.h>
-#include <ScriptEngine.h>
-#include <ScriptValue.h>
+#include <AddressManager.h>
+#include "ScriptContext.h"
+#include "ScriptEngine.h"
+#include "ScriptValue.h"
 
 LocationScriptingInterface* LocationScriptingInterface::getInstance() {
     static LocationScriptingInterface sharedInstance;
diff --git a/libraries/networking/src/LocationScriptingInterface.h b/libraries/script-engine/src/LocationScriptingInterface.h
similarity index 96%
rename from libraries/networking/src/LocationScriptingInterface.h
rename to libraries/script-engine/src/LocationScriptingInterface.h
index 0fc6b6ec72..7603e113fa 100644
--- a/libraries/networking/src/LocationScriptingInterface.h
+++ b/libraries/script-engine/src/LocationScriptingInterface.h
@@ -1,6 +1,6 @@
 //
 //  LocationScriptingInterface.h
-//  libraries/networking/src
+//  libraries/script-engine/src
 //
 //  Created by Ryan Huffman on 4/29/14.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/plugins/hifiSdl2/CMakeLists.txt b/plugins/hifiSdl2/CMakeLists.txt
index 16ce6f51b4..47d382681f 100644
--- a/plugins/hifiSdl2/CMakeLists.txt
+++ b/plugins/hifiSdl2/CMakeLists.txt
@@ -17,6 +17,5 @@ if (NOT APPLE)
     endif()
     setup_hifi_plugin(Qml)
     link_hifi_libraries(shared controllers ui plugins input-plugins)
-    include_hifi_library_headers(script-engine)
     target_sdl2()
 endif()