update linux build

nervosys · Mar 6, 2024 · 02caa5e · 02caa5e
1 parent a8ed2d9
commit 02caa5e
Show file tree

Hide file tree

Showing 38 changed files with 34 additions and 31 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -1,4 +1,4 @@
 # Skip json.hpp since it is copied directly from external repo
 AutonomyLib/include/common/utils/json.hpp
-AutonomySim/MavLinkCom/common_utils/json.hpp
+AutonomySim/MavLinkCom/common/utils/json.hpp
 mkdocs.yml
diff --git a/AutonomyLib/include/common/AutonomySimSettings.hpp b/AutonomyLib/include/common/AutonomySimSettings.hpp
@@ -7,7 +7,7 @@
 #include "CommonStructs.hpp"
 #include "ImageCaptureBase.hpp"
 #include "Settings.hpp"
-#include "common_utils/Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include "sensors/SensorBase.hpp"
 #include <exception>
 #include <functional>

diff --git a/AutonomyLib/include/common/GaussianMarkov.hpp b/AutonomyLib/include/common/GaussianMarkov.hpp
@@ -6,7 +6,7 @@
 
 #include "UpdatableObject.hpp"
 #include "common/Common.hpp"
-#include "common_utils/RandomGenerator.hpp"
+#include "common/utils/RandomGenerator.hpp"
 #include <list>
 
 namespace nervosys {

diff --git a/AutonomyLib/include/common/Settings.hpp b/AutonomyLib/include/common/Settings.hpp
@@ -4,17 +4,17 @@
 #ifndef autonomylib_common_Settings_hpp
 #define autonomylib_common_Settings_hpp
 
-#include "common_utils/Utils.hpp"
+#include "common/utils/Utils.hpp"
 
 STRICT_MODE_OFF
 // this json library is not strict clean
 // TODO: HACK!! below are added temporariliy because something is defining min, max macros
 // #undef max
 #undef min
-#include "common_utils/json.hpp"
+#include "common/utils/json.hpp"
 STRICT_MODE_ON
 
-#include "common_utils/FileSystem.hpp"
+#include "common/utils/FileSystem.hpp"
 #include <mutex>
 #include <string>
 

diff --git a/AutonomyLib/include/common/StateReporterWrapper.hpp b/AutonomyLib/include/common/StateReporterWrapper.hpp
@@ -8,7 +8,7 @@
 #include "UpdatableObject.hpp"
 #include "common/Common.hpp"
 #include "common/FrequencyLimiter.hpp"
-#include "common_utils/OnlineStats.hpp"
+#include "common/utils/OnlineStats.hpp"
 #include <iomanip>
 #include <sstream>
 #include <string>

diff --git a/MavLinkCom/common_utils/EnumFlags.hpp → MavLinkCom/common/utils/EnumFlags.hpp b/MavLinkCom/common_utils/EnumFlags.hpp → MavLinkCom/common/utils/EnumFlags.hpp
diff --git a/MavLinkCom/common_utils/ExceptionUtils.hpp → MavLinkCom/common/utils/ExceptionUtils.hpp b/MavLinkCom/common_utils/ExceptionUtils.hpp → MavLinkCom/common/utils/ExceptionUtils.hpp
diff --git a/MavLinkCom/common_utils/FileSystem.cpp → MavLinkCom/common/utils/FileSystem.cpp b/MavLinkCom/common_utils/FileSystem.cpp → MavLinkCom/common/utils/FileSystem.cpp
diff --git a/MavLinkCom/common_utils/FileSystem.hpp → MavLinkCom/common/utils/FileSystem.hpp b/MavLinkCom/common_utils/FileSystem.hpp → MavLinkCom/common/utils/FileSystem.hpp
diff --git a/MavLinkCom/common_utils/StrictMode.hpp → MavLinkCom/common/utils/StrictMode.hpp b/MavLinkCom/common_utils/StrictMode.hpp → MavLinkCom/common/utils/StrictMode.hpp
diff --git a/MavLinkCom/common_utils/ThreadUtils.cpp → MavLinkCom/common/utils/ThreadUtils.cpp b/MavLinkCom/common_utils/ThreadUtils.cpp → MavLinkCom/common/utils/ThreadUtils.cpp
diff --git a/MavLinkCom/common_utils/ThreadUtils.hpp → MavLinkCom/common/utils/ThreadUtils.hpp b/MavLinkCom/common_utils/ThreadUtils.hpp → MavLinkCom/common/utils/ThreadUtils.hpp
diff --git a/MavLinkCom/common_utils/Utils.hpp → MavLinkCom/common/utils/Utils.hpp b/MavLinkCom/common_utils/Utils.hpp → MavLinkCom/common/utils/Utils.hpp
diff --git a/MavLinkCom/common_utils/json.hpp → MavLinkCom/common/utils/json.hpp b/MavLinkCom/common_utils/json.hpp → MavLinkCom/common/utils/json.hpp
diff --git a/MavLinkCom/common_utils/optional.hpp → MavLinkCom/common/utils/optional.hpp b/MavLinkCom/common_utils/optional.hpp → MavLinkCom/common/utils/optional.hpp
diff --git a/MavLinkCom/common_utils/prettyprint.hpp → MavLinkCom/common/utils/prettyprint.hpp b/MavLinkCom/common_utils/prettyprint.hpp → MavLinkCom/common/utils/prettyprint.hpp
diff --git a/MavLinkCom/common_utils/sincos.hpp → MavLinkCom/common/utils/sincos.hpp b/MavLinkCom/common_utils/sincos.hpp → MavLinkCom/common/utils/sincos.hpp
diff --git a/MavLinkCom/common_utils/type_utils.hpp → MavLinkCom/common/utils/type_utils.hpp b/MavLinkCom/common_utils/type_utils.hpp → MavLinkCom/common/utils/type_utils.hpp
diff --git a/MavLinkCom/src/MavLinkLog.cpp b/MavLinkCom/src/MavLinkLog.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "MavLinkLog.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <chrono>
 
 using namespace mavlinkcom;

diff --git a/MavLinkCom/src/MavLinkMessageBase.cpp b/MavLinkCom/src/MavLinkMessageBase.cpp
@@ -12,7 +12,7 @@ STRICT_MODE_ON
 
 #include "MavLinkConnection.hpp"
 #include "MavLinkMessageBase.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <cmath>
 #include <sstream>
 

diff --git a/MavLinkCom/src/Semaphore.cpp b/MavLinkCom/src/Semaphore.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "Semaphore.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 
 using namespace mavlink_utils;
 

diff --git a/MavLinkCom/src/UdpSocket.cpp b/MavLinkCom/src/UdpSocket.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "UdpSocket.hpp"
 #include "impl/UdpSocketImpl.hpp"
 

diff --git a/MavLinkCom/src/impl/AdHocConnectionImpl.cpp b/MavLinkCom/src/impl/AdHocConnectionImpl.cpp
@@ -6,8 +6,8 @@
 #include "../serial_com/SerialPort.hpp"
 #include "../serial_com/TcpClientPort.hpp"
 #include "../serial_com/UdpClientPort.hpp"
-#include "ThreadUtils.hpp"
-#include "Utils.hpp"
+#include "common/utils/ThreadUtils.hpp"
+#include "common/utils/Utils.hpp"
 
 using namespace mavlink_utils;
 using namespace mavlinkcom_impl;

diff --git a/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp b/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp
@@ -7,8 +7,8 @@
 #include "../serial_com/TcpClientPort.hpp"
 #include "../serial_com/UdpClientPort.hpp"
 #include "MavLinkMessages.hpp"
-#include "ThreadUtils.hpp"
-#include "Utils.hpp"
+#include "common/utils/ThreadUtils.hpp"
+#include "common/utils/Utils.hpp"
 
 using namespace mavlink_utils;
 using namespace mavlinkcom_impl;

diff --git a/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp b/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #include "MavLinkFtpClientImpl.hpp"
-#include "FileSystem.hpp"
-#include "Utils.hpp"
+#include "common/utils/FileSystem.hpp"
+#include "common/utils/Utils.hpp"
 #include <mutex>
 #include <sys/stat.h>
 

diff --git a/MavLinkCom/src/impl/MavLinkNodeImpl.cpp b/MavLinkCom/src/impl/MavLinkNodeImpl.cpp
@@ -4,8 +4,8 @@
 #include "MavLinkNodeImpl.hpp"
 #include "MavLinkMessages.hpp"
 #include "Semaphore.hpp"
-#include "ThreadUtils.hpp"
-#include "Utils.hpp"
+#include "common/utils/ThreadUtils.hpp"
+#include "common/utils/Utils.hpp"
 
 using namespace mavlink_utils;
 using namespace mavlinkcom_impl;

diff --git a/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp b/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp
@@ -5,7 +5,7 @@
 #include "../serial_com/SerialPort.hpp"
 #include "../serial_com/UdpClientPort.hpp"
 #include "MavLinkConnection.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <cstring>
 #include <exception>
 

diff --git a/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp b/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp
@@ -8,8 +8,8 @@
 
 #include "MavLinkMessages.hpp"
 #include "MavLinkNodeImpl.hpp"
-#include "Utils.hpp"
 #include "VehicleState.hpp"
+#include "common/utils/Utils.hpp"
 
 #include "../serial_com/Port.h"
 #include "AsyncResult.hpp"

diff --git a/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp b/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp
@@ -3,7 +3,7 @@
 
 #include "MavLinkVideoStreamImpl.hpp"
 #include "MavLinkMessages.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <chrono>
 
 #define PACKET_PAYLOAD 253 // hard coded in MavLink code - do not change

diff --git a/MavLinkCom/src/impl/UdpSocketImpl.hpp b/MavLinkCom/src/impl/UdpSocketImpl.hpp
@@ -2,7 +2,7 @@
 #define MavLinkCom_UdpSocketImpl_hpp
 
 #include "UdpSocket.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #ifdef _WIN32
 // windows
 #ifndef WIN32_LEAN_AND_MEAN

diff --git a/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp b/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "MavLinkConnection.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 
 #include <codecvt>
 #include <cstdio>

diff --git a/MavLinkCom/src/serial_com/SerialPort.cpp b/MavLinkCom/src/serial_com/SerialPort.cpp
@@ -4,8 +4,8 @@
 #include "SerialPort.hpp"
 
 #ifdef _WIN32
-#include "Utils.hpp"
 #include "Windows.h"
+#include "common/utils/Utils.hpp"
 #include <Wbemidl.h>
 #include <comdef.h>
 #include <string>

diff --git a/MavLinkCom/src/serial_com/SerialPort.hpp b/MavLinkCom/src/serial_com/SerialPort.hpp
@@ -5,7 +5,7 @@
 #define SERIAL_COM_SERIALPORT_HPP
 
 #include "Port.h"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <memory>
 #include <string>
 

diff --git a/MavLinkCom/src/serial_com/SocketInit.cpp b/MavLinkCom/src/serial_com/SocketInit.cpp
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #include "SocketInit.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <stdexcept>
 
 #ifdef _WIN32

diff --git a/MavLinkCom/src/serial_com/TcpClientPort.cpp b/MavLinkCom/src/serial_com/TcpClientPort.cpp
@@ -3,7 +3,7 @@
 
 #include "TcpClientPort.hpp"
 #include "SocketInit.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include "wifi.h"
 #include <cstdio>
 #include <string>

diff --git a/MavLinkCom/src/serial_com/UdpClientPort.cpp b/MavLinkCom/src/serial_com/UdpClientPort.cpp
@@ -3,7 +3,7 @@
 
 #include "UdpClientPort.hpp"
 #include "SocketInit.hpp"
-#include "Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include "wifi.h"
 #include <cstdio>
 #include <cstring>

diff --git a/MavLinkCom/src/serial_com/wifi.cpp b/MavLinkCom/src/serial_com/wifi.cpp
@@ -3,7 +3,7 @@
 
 #if defined(linux) | defined(__linux)
 
-#include "common_utils/Utils.hpp"
+#include "common/utils/Utils.hpp"
 #include <linux/wireless.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/cmake/MavLinkCom/CMakeLists.txt b/cmake/MavLinkCom/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(
   ${AUTONOMYSIM_ROOT}/MavLinkCom/include
 )
 
-list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/common_utils/FileSystem.cpp")
-list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/common_utils/ThreadUtils.cpp")
+list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/common/utils/FileSystem.cpp")
+list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/common/utils/ThreadUtils.cpp")
 list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/src/AdHocConnection.cpp") 
 list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/src/MavLinkConnection.cpp") 
 list(APPEND MAVLINK_SOURCES "${AUTONOMYSIM_ROOT}/MavLinkCom/src/MavLinkFtpClient.cpp")