SCRIPT Run cc include replacements

datalog/examples/printlog/printlog.cpp

@@ -9,11 +9,11 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include <wpi/DenseMap.h>
-#include <wpi/MemoryBuffer.h>
-#include <wpi/print.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/print.hpp"
 
-#include "wpi/datalog/DataLogReader.h"
+#include "wpi/datalog/DataLogReader.hpp"
 
 int main(int argc, const char** argv) {
   if (argc != 2) {

datalog/examples/writelog/writelog.cpp

@@ -8,9 +8,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/print.h>
+#include "wpi/util/print.hpp"
 
-#include "wpi/datalog/DataLogBackgroundWriter.h"
+#include "wpi/datalog/DataLogBackgroundWriter.hpp"
 
 int main(int argc, char** argv) {
   using std::chrono::duration_cast;

datalog/src/main/native/cpp/DataLog.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/DataLog.h"
+#include "wpi/datalog/DataLog.hpp"
 
 #include <algorithm>
 #include <bit>
@@ -13,11 +13,11 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/Endian.h>
-#include <wpi/Logger.h>
-#include <wpi/SmallString.h>
-#include <wpi/print.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/Endian.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace wpi::log;
 

datalog/src/main/native/cpp/DataLogBackgroundWriter.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/DataLogBackgroundWriter.h"
+#include "wpi/datalog/DataLogBackgroundWriter.hpp"
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -24,8 +24,8 @@
 
 #include <fmt/format.h>
 
-#include "wpi/Logger.h"
-#include "wpi/fs.h"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/fs.hpp"
 
 using namespace wpi::log;
 

datalog/src/main/native/cpp/DataLogReader.cpp

@@ -2,14 +2,14 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/DataLogReader.h"
+#include "wpi/datalog/DataLogReader.hpp"
 
 #include <bit>
 #include <utility>
 
-#include <wpi/Endian.h>
+#include "wpi/util/Endian.hpp"
 
-#include "wpi/datalog/DataLog.h"
+#include "wpi/datalog/DataLog.hpp"
 
 using namespace wpi::log;
 

datalog/src/main/native/cpp/DataLogReaderThread.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/DataLogReaderThread.h"
+#include "wpi/datalog/DataLogReaderThread.hpp"
 
 #include <string>
 #include <utility>
 
-#include <wpi/StringExtras.h>
-#include <wpi/print.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace wpi::log;
 

datalog/src/main/native/cpp/DataLogWriter.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/DataLogWriter.h"
+#include "wpi/datalog/DataLogWriter.hpp"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include <wpi/raw_ostream.h>
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace wpi::log;
 

datalog/src/main/native/cpp/FileLogger.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/datalog/FileLogger.h"
+#include "wpi/datalog/FileLogger.hpp"
 
 #ifdef __linux__
 #include <fcntl.h>
@@ -18,7 +18,7 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 namespace wpi::log {
 FileLogger::FileLogger(std::string_view file,

datalog/src/main/native/cpp/jni/DataLogJNI.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "DataLogJNI.h"
+#include "DataLogJNI.hpp"
 
 #include <jni.h>
 
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_datalog_DataLogJNI.h"
-#include "wpi/datalog/DataLog.h"
-#include "wpi/datalog/DataLogBackgroundWriter.h"
-#include "wpi/datalog/DataLogWriter.h"
-#include "wpi/datalog/FileLogger.h"
+#include "wpi/datalog/DataLog.hpp"
+#include "wpi/datalog/DataLogBackgroundWriter.hpp"
+#include "wpi/datalog/DataLogWriter.hpp"
+#include "wpi/datalog/FileLogger.hpp"
 
 using namespace wpi::java;
 using namespace wpi::log;

datalog/src/main/native/include/wpi/datalog/DataLog.hpp

@@ -19,14 +19,14 @@
 #include <vector>
 #include <version>
 
-#include <wpi/DenseMap.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringMap.h>
-#include <wpi/mutex.h>
-#include <wpi/protobuf/Protobuf.h>
-#include <wpi/string.h>
-#include <wpi/struct/Struct.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/string.h"
+#include "wpi/util/struct/Struct.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "wpi/datalog/DataLog_c.h"
 

datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp

@@ -12,10 +12,10 @@
 #include <string_view>
 #include <thread>
 
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "wpi/datalog/DataLog.h"
+#include "wpi/datalog/DataLog.hpp"
 
 namespace wpi {
 class Logger;

datalog/src/main/native/include/wpi/datalog/DataLogReader.hpp

@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/MemoryBuffer.h>
+#include "wpi/util/MemoryBuffer.hpp"
 
 namespace wpi::log {
 

datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp

@@ -15,12 +15,12 @@
 
 #include <upb/mem/arena.h>
 #include <upb/reflection/def.h>
-#include <wpi/DenseMap.h>
-#include <wpi/Signal.h>
-#include <wpi/mutex.h>
-#include <wpi/struct/DynamicStruct.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/Signal.h"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/struct/DynamicStruct.hpp"
 
-#include "wpi/datalog/DataLogReader.h"
+#include "wpi/datalog/DataLogReader.hpp"
 
 namespace wpi::log {
 

datalog/src/main/native/include/wpi/datalog/DataLogWriter.hpp

@@ -8,7 +8,7 @@
 #include <string_view>
 #include <system_error>
 
-#include "wpi/datalog/DataLog.h"
+#include "wpi/datalog/DataLog.hpp"
 
 namespace wpi {
 class raw_ostream;

datalog/src/main/native/include/wpi/datalog/DataLog_c.h

@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include <wpi/string.h>
+#include "wpi/util/string.h"
 
 #ifdef __cplusplus
 extern "C" {

datalog/src/main/native/include/wpi/datalog/FileLogger.hpp

@@ -8,7 +8,7 @@
 #include <string_view>
 #include <thread>
 
-#include "wpi/datalog/DataLog.h"
+#include "wpi/datalog/DataLog.hpp"
 
 namespace wpi::log {
 /**

datalog/src/main/python/pyproject.toml

@@ -43,8 +43,8 @@ update_init = [
 scan_headers_ignore = [
     # wpi/datalog
     "wpi/datalog/DataLog_c.h",
-    "wpi/datalog/DataLogReaderThread.h",
-    "wpi/datalog/FileLogger.h",
+    "wpi/datalog/DataLogReaderThread.hpp",
+    "wpi/datalog/FileLogger.hpp",
 ]
 
 [tool.semiwrap.extension_modules."wpilog._wpilog"]
@@ -54,10 +54,10 @@ depends = ["wpiutil"]
 
 [tool.semiwrap.extension_modules."wpilog._wpilog".headers]
 # wpi/datalog
-DataLog = "wpi/datalog/DataLog.h"
-DataLogBackgroundWriter = "wpi/datalog/DataLogBackgroundWriter.h"
-DataLogReader = "wpi/datalog/DataLogReader.h"
-# DataLogReaderThread = "wpi/datalog/DataLogReaderThread.h"
-DataLogWriter = "wpi/datalog/DataLogWriter.h"
+DataLog = "wpi/datalog/DataLog.hpp"
+DataLogBackgroundWriter = "wpi/datalog/DataLogBackgroundWriter.hpp"
+DataLogReader = "wpi/datalog/DataLogReader.hpp"
+# DataLogReaderThread = "wpi/datalog/DataLogReaderThread.hpp"
+DataLogWriter = "wpi/datalog/DataLogWriter.hpp"
 # DataLog_c = "wpi/datalog/DataLog_c.h"
-# FileLogger = "wpi/datalog/FileLogger.h"
+# FileLogger = "wpi/datalog/FileLogger.hpp"

datalog/src/test/native/cpp/DataLogTest.cpp

@@ -8,10 +8,10 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include <wpi/Logger.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
-#include "wpi/datalog/DataLogWriter.h"
+#include "wpi/datalog/DataLogWriter.hpp"
 
 namespace {
 struct ThingA {

datalog/src/test/native/cpp/FileLoggerTest.cpp

@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/datalog/FileLogger.h"
+#include "wpi/datalog/FileLogger.hpp"
 
 TEST(FileLoggerTest, BufferSingleLine) {
   std::vector<std::string> buf;