Split datalog from wpiutil

Author: virtuald

rdev.toml

@@ -44,6 +44,10 @@ hatch-robotpy = "~=0.2"
 py_version = "native"
 robot = true
 
+[subprojects."robotpy-native-datalog"]
+py_version = "native"
+robot = true
+
 [subprojects."robotpy-native-wpinet"]
 py_version = "native"
 robot = true
@@ -80,6 +84,10 @@ robot = false
 py_version = "wrapper"
 robot = true
 
+[subprojects."robotpy-wpilog"]
+py_version = "wrapper"
+robot = true
+
 [subprojects."robotpy-wpinet"]
 py_version = "wrapper"
 robot = true

subprojects/robotpy-native-datalog/.gitignore

@@ -0,0 +1,2 @@
+/dist
+/src

subprojects/robotpy-native-datalog/pyproject.toml

@@ -0,0 +1,40 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = [
+    "hatchling",
+    "hatch-nativelib~=0.2.0",
+    "hatch-robotpy~=0.2",
+    "robotpy-native-wpiutil==2027.0.0a1",
+]
+
+[project]
+name = "robotpy-native-datalog"
+version = "2027.0.0a1"
+description = "WPILib Utility Library"
+license = "BSD-3-Clause"
+
+dependencies = [
+    "robotpy-native-wpiutil==2027.0.0a1",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/native"]
+
+
+[[tool.hatch.build.hooks.robotpy.maven_lib_download]]
+artifact_id = "datalog-cpp"
+group_id = "edu.wpi.first.datalog"
+repo_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
+version = "2027.0.0-alpha-1"
+
+extract_to = "src/native/datalog"
+libs = ["datalog"]
+
+[[tool.hatch.build.hooks.nativelib.pcfile]]
+pcfile = "src/native/datalog/robotpy-native-datalog.pc"
+name = "datalog"
+
+includedir = "src/native/datalog/include"
+libdir = "src/native/datalog/lib"
+shared_libraries = ["datalog"]
+requires = ["robotpy-native-wpiutil"]

subprojects/robotpy-wpilog/.gitignore

@@ -0,0 +1,10 @@
+/build
+/dist
+*.pc
+*.so
+*.dll
+*.dylib
+
+/wpilog/_init__wpilog.py
+/wpilog/version.py
+/wpilog/trampolines

subprojects/robotpy-wpilog/meson.build

@@ -0,0 +1,11 @@
+project('robotpy-wpilog', ['cpp'],
+        default_options: ['warning_level=1', 'cpp_std=c++20',
+                          'b_colorout=auto', 'optimization=2', 'b_pie=true'])
+
+subdir('semiwrap')
+
+wpilog_sources += files(
+    'src/main.cpp',
+)
+
+subdir('semiwrap/modules')

subprojects/robotpy-wpilog/pyproject.toml

@@ -0,0 +1,63 @@
+[build-system]
+build-backend = "hatchling.build"
+requires = [
+    "semiwrap~=0.1.2",
+    "hatch-meson~=0.1.0b2",
+    "hatchling",
+    "robotpy-native-datalog==2027.0.0a1",
+    "robotpy-wpiutil==2027.0.0a1"
+]
+
+[project]
+name = "robotpy-wpilog"
+version = "2027.0.0a1"
+description = "Binary wrapper for FRC wpilog library"
+authors = [
+    {name = "RobotPy Development Team", email = "[email protected]"},
+]
+license = "BSD-3-Clause"
+dependencies = [
+    "robotpy-native-datalog==2027.0.0a1",
+    "robotpy-wpiutil==2027.0.0a1"
+]
+
+[project.urls]
+"Source code" = "https://github.com/robotpy/mostrobotpy"
+
+
+[tool.hatch.build.hooks.robotpy]
+version_file = "wpilog/version.py"
+
+[tool.hatch.build.hooks.semiwrap]
+
+[tool.hatch.build.hooks.meson]
+
+[tool.hatch.build.targets.wheel]
+packages = ["wpilog"]
+
+
+[tool.semiwrap]
+update_init = [
+    "wpilog"
+]
+scan_headers_ignore = [
+    # wpi/datalog
+    "wpi/datalog/DataLog_c.h",
+    "wpi/datalog/DataLogReaderThread.h",
+    "wpi/datalog/FileLogger.h",
+]
+
+[tool.semiwrap.extension_modules."wpilog._wpilog"]
+name = "wpilog"
+wraps = ["robotpy-native-datalog"]
+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_c = "wpi/datalog/DataLog_c.h"
+# FileLogger = "wpi/datalog/FileLogger.h"

subprojects/robotpy-wpilog/semiwrap/.gitignore

@@ -0,0 +1,3 @@
+/meson.build
+/modules/meson.build
+/trampolines/meson.build

subprojects/robotpy-wpiutil/semiwrap/DataLog.yml renamed to subprojects/robotpy-wpilog/semiwrap/DataLog.yml

@@ -1,12 +1,11 @@
 ---
-defaults:
-  ignore: true
-  report_ignored_missing: false
+# defaults:
+#   ignore: true
+#   report_ignored_missing: false
 enums:
   ControlRecordType:
 classes:
   wpi::log::DataLog:
-    subpackage: log
     attributes:
       kBlockSize:
       s_defaultMessageLog:
@@ -72,7 +71,6 @@ classes:
       BufferHalfFull:
       BufferFull:
   wpi::log::DataLogEntry:
-    subpackage: log
     force_no_trampoline: true
     methods:
       SetMetadata:
@@ -100,7 +98,6 @@ classes:
             ignore: true
           DataLog&, std::string_view, std::string_view, std::string_view, int64_t:
   wpi::log::RawLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -115,7 +112,6 @@ classes:
       Append:
       Update:
   wpi::log::BooleanLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -129,7 +125,6 @@ classes:
       Append:
       Update:
   wpi::log::IntegerLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -143,7 +138,6 @@ classes:
       Append:
       Update:
   wpi::log::FloatLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -157,7 +151,6 @@ classes:
       Append:
       Update:
   wpi::log::DoubleLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -171,7 +164,6 @@ classes:
       Append:
       Update:
   wpi::log::StringLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -186,7 +178,6 @@ classes:
       Append:
       Update:
   wpi::log::BooleanArrayLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -219,7 +210,6 @@ classes:
           std::span<const uint8_t>, int64_t:
             ignore: true
   wpi::log::IntegerArrayLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -241,7 +231,6 @@ classes:
           std::initializer_list<int64_t>, int64_t:
             ignore: true
   wpi::log::FloatArrayLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -263,7 +252,6 @@ classes:
           std::initializer_list<float>, int64_t:
             ignore: true
   wpi::log::DoubleArrayLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -285,7 +273,6 @@ classes:
           std::initializer_list<double>, int64_t:
             ignore: true
   wpi::log::StringArrayLogEntry:
-    subpackage: log
     force_no_trampoline: true
     attributes:
       kDataType:
@@ -373,7 +360,6 @@ classes:
             ignore: true
           std::span<const T>, int64_t:
   wpi::log::ProtobufLogEntry:
-    subpackage: log
     force_no_trampoline: true
     ignore: true
     methods:
@@ -387,69 +373,56 @@ classes:
 templates:
   StructLogEntry:
     qualname: wpi::log::StructLogEntry
-    subpackage: log
     params:
     - WPyStruct
     - WPyStructInfo
   StructArrayLogEntry:
     qualname: wpi::log::StructArrayLogEntry
-    subpackage: log
     params:
     - WPyStruct
     - WPyStructInfo
 
   _RawLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<uint8_t>
   _BooleanLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - bool
   _IntegerLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - int64_t
   _FloatLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - float
   _DoubleLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - double
   _StringLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::string
   _BooleanArrayLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<int>
   _IntegerArrayLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<int64_t>
   _FloatArrayLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<float>
   _DoubleArrayLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<double>
   _StringArrayLogEntryImpl:
     qualname: wpi::log::DataLogValueEntryImpl
-    subpackage: log
     params:
     - std::vector<std::string>

subprojects/robotpy-wpiutil/semiwrap/DataLogBackgroundWriter.yml renamed to subprojects/robotpy-wpilog/semiwrap/DataLogBackgroundWriter.yml

@@ -2,7 +2,6 @@
 
 classes:
   wpi::log::StartRecordData:
-    subpackage: log
     attributes:
       entry:
         access: readonly
@@ -13,14 +12,12 @@ classes:
       metadata:
         access: readonly
   wpi::log::MetadataRecordData:
-    subpackage: log
     attributes:
       entry:
         access: readonly
       metadata:
         access: readonly
   wpi::log::DataLogRecord:
-    subpackage: log
     methods:
       DataLogRecord:
         overloads:
@@ -267,7 +264,6 @@ classes:
   wpi::log::DataLogIterator:
     ignore: true
   wpi::log::DataLogReader:
-    subpackage: log
     typealias:
       - wpi::MemoryBuffer
     methods: