fix bazel build for libdatalog, epilogue, ntcore, wpiutil

wpilibsuite · Jan 27, 2025 · d211d07 · d211d07
1 parent e0ca7c6
commit d211d07
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 31 deletions.
diff --git a/epilogue-runtime/BUILD.bazel b/epilogue-runtime/BUILD.bazel
@@ -8,5 +8,6 @@ java_library(
         "//ntcore:networktables-java",
         "//wpiunits",
         "//wpiutil:wpiutil-java",
+        "//libdatalog:datalog-java"
     ],
 )
diff --git a/libdatalog/BUILD.bazel b/libdatalog/BUILD.bazel
@@ -17,3 +17,46 @@ cc_library(
         "//wpiutil:wpiutil.static",
     ],
 )
+
+java_library(
+    name = "datalog-java",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//wpiutil:wpiutil-java",
+        "@maven//:us_hebi_quickbuf_quickbuf_runtime",
+    ],
+)
+
+py_binary(
+    name = "datalog",
+    srcs = ["examples/printlog/datalog.py"],
+    tags = ["manual"],
+)
+
+cc_binary(
+    name = "printlog",
+    srcs = ["examples/printlog/printlog.cpp"],
+    deps = [
+        "//wpiutil:wpiutil.static",
+        ":libdatalog.static"
+    ],
+)
+
+cc_binary(
+    name = "writelog",
+    srcs = ["examples/writelog/writelog.cpp"],
+    deps = [
+        "//wpiutil:wpiutil.static",
+        ":libdatalog.static"
+    ],
+)
+
+java_binary(
+    name = "printlog-java",
+    srcs = ["src/printlog/java/printlog/PrintLog.java"],
+    main_class = "printlog.PrintLog",
+    deps = [
+        ":datalog-java"
+    ],
+)
diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel
@@ -41,6 +41,7 @@ cc_library(
         ":generated_cc_headers",
         "//wpinet:wpinet.static",
         "//wpiutil:wpiutil.static",
+        "//libdatalog:libdatalog.static",
     ],
 )
 
@@ -50,6 +51,7 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//wpiutil:wpiutil-java",
+        "//libdatalog:datalog-java",
         "@maven//:us_hebi_quickbuf_quickbuf_runtime",
     ],
 )

diff --git a/wpiutil/BUILD.bazel b/wpiutil/BUILD.bazel
@@ -284,34 +284,3 @@ java_binary(
         ":wpiutil-java",
     ],
 )
-
-py_binary(
-    name = "datalog",
-    srcs = ["examples/printlog/datalog.py"],
-    tags = ["manual"],
-)
-
-cc_binary(
-    name = "printlog",
-    srcs = ["examples/printlog/printlog.cpp"],
-    deps = [
-        ":wpiutil.static",
-    ],
-)
-
-cc_binary(
-    name = "writelog",
-    srcs = ["examples/writelog/writelog.cpp"],
-    deps = [
-        ":wpiutil.static",
-    ],
-)
-
-java_binary(
-    name = "printlog-java",
-    srcs = ["src/printlog/java/printlog/PrintLog.java"],
-    main_class = "printlog.PrintLog",
-    deps = [
-        ":wpiutil-java",
-    ],
-)