From 76881e2940f0e373560cfd3654d74b4f279194bf Mon Sep 17 00:00:00 2001 From: Austin Schuh Date: Thu, 31 Jul 2025 23:03:19 -0700 Subject: [PATCH] [bazel] Rename liblibglass -> libglass (#8135) The lib gets automatically added, don't add it by hand. --- BUILD.bazel | 14 +++++++------- datalogtool/BUILD.bazel | 2 +- glass/BUILD.bazel | 16 ++++++++-------- outlineviewer/BUILD.bazel | 4 ++-- simulation/halsim_gui/BUILD.bazel | 4 ++-- sysid/BUILD.bazel | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index c48043dcae..5bccf447de 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -63,14 +63,14 @@ publish_all( "//cscore:cscore-java_publish", "//datalog:datalog-cpp_publish", "//datalog:datalog-java_publish", + "//epilogue-processor:processor-java_publish", + "//epilogue-runtime:epilogue-java_publish", "//fieldImages:fieldImages-cpp_publish", "//fieldImages:fieldImages-java_publish", - "//epilogue-runtime:epilogue-java_publish", - "//epilogue-processor:processor-java_publish", - "//glass:libglass-cpp_publish", - "//glass:libglassnt-cpp_publish", - "//hal:wpiHal-cpp_publish", + "//glass:glass-cpp_publish", + "//glass:glassnt-cpp_publish", "//hal:hal-java_publish", + "//hal:wpiHal-cpp_publish", "//ntcore:ntcore-cpp_publish", "//ntcore:ntcore-java_publish", "//romiVendordep:romiVendordep-cpp_publish", @@ -84,10 +84,10 @@ publish_all( "//thirdparty/googletest:googletest-cpp_publish", "//thirdparty/imgui_suite:imgui-cpp_publish", "//wpigui:wpigui-cpp_publish", - "//wpilibc:wpilibc-cpp_publish", - "//wpilibj:wpilibj-java_publish", "//wpilibNewCommands:wpilibNewCommands-cpp_publish", "//wpilibNewCommands:wpilibNewCommands-java_publish", + "//wpilibc:wpilibc-cpp_publish", + "//wpilibj:wpilibj-java_publish", "//wpimath:wpimath-cpp_publish", "//wpimath:wpimath-java_publish", "//wpinet:wpinet-cpp_publish", diff --git a/datalogtool/BUILD.bazel b/datalogtool/BUILD.bazel index 61dd6b86e9..8fb804d9cd 100644 --- a/datalogtool/BUILD.bazel +++ b/datalogtool/BUILD.bazel @@ -51,7 +51,7 @@ cc_binary( }), deps = [ "//datalog", - "//glass:libglass", + "//glass", "@bzlmodrio-libssh//libraries/cpp/libssh", ], ) diff --git a/glass/BUILD.bazel b/glass/BUILD.bazel index 7fec6487f8..b10bfb0cd8 100644 --- a/glass/BUILD.bazel +++ b/glass/BUILD.bazel @@ -5,7 +5,7 @@ load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources") load("//shared/bazel/rules/gen:gen-version-file.bzl", "generate_version_file") wpilib_cc_library( - name = "libglass", + name = "glass", srcs = glob(["src/lib/native/cpp/**/*.cpp"]), hdrs = glob(["src/lib/native/include/**"]), hdrs_pkg_root = "src/lib/native/include", @@ -34,12 +34,12 @@ wpilib_cc_static_library( ], visibility = ["//visibility:public"], deps = [ - ":libglass", + ":glass", ], ) wpilib_cc_library( - name = "libglassnt", + name = "glassnt", srcs = glob(["src/libnt/native/cpp/*.cpp"]), hdrs = glob(["src/libnt/native/include/**/*.h"]), hdrs_pkg_root = "src/libnt/native/include", @@ -51,7 +51,7 @@ wpilib_cc_library( ], visibility = ["//visibility:public"], deps = [ - ":libglass", + ":glass", "//ntcore", ], ) @@ -64,7 +64,7 @@ wpilib_cc_static_library( ], visibility = ["//visibility:public"], deps = [ - ":libglassnt", + ":glassnt", ], ) @@ -95,18 +95,18 @@ cc_binary( "wpi-cpp-gui", ], deps = [ - ":libglassnt", + ":glassnt", ], ) package_minimal_cc_project( - name = "libglass", + name = "glass", maven_artifact_name = "libglass", maven_group_id = "edu.wpi.first.glass", ) package_minimal_cc_project( - name = "libglassnt", + name = "glassnt", maven_artifact_name = "libglassnt", maven_group_id = "edu.wpi.first.glass", ) diff --git a/outlineviewer/BUILD.bazel b/outlineviewer/BUILD.bazel index 6304f91659..4b754509ed 100644 --- a/outlineviewer/BUILD.bazel +++ b/outlineviewer/BUILD.bazel @@ -34,7 +34,7 @@ cc_binary( "//conditions:default": [], }), deps = [ - "//glass:libglass", - "//glass:libglassnt", + "//glass", + "//glass:glassnt", ], ) diff --git a/simulation/halsim_gui/BUILD.bazel b/simulation/halsim_gui/BUILD.bazel index c8bbd22f91..f14ad8a1c6 100644 --- a/simulation/halsim_gui/BUILD.bazel +++ b/simulation/halsim_gui/BUILD.bazel @@ -23,7 +23,7 @@ wpilib_cc_library( }), visibility = ["//visibility:public"], deps = [ - "//glass:libglassnt", + "//glass:glassnt", "//hal:wpiHal", ], ) @@ -52,7 +52,7 @@ wpilib_cc_library( }), visibility = ["//visibility:public"], deps = [ - "//glass:libglassnt", + "//glass:glassnt", "//hal:wpiHal", ], ) diff --git a/sysid/BUILD.bazel b/sysid/BUILD.bazel index 42c0ff4f5e..7d8f3229a0 100644 --- a/sysid/BUILD.bazel +++ b/sysid/BUILD.bazel @@ -28,7 +28,7 @@ cc_library( strip_include_prefix = "src/main/native/include", deps = [ "//datalog", - "//glass:libglass", + "//glass", "//wpinet", ], )