Remove generated google protobuf support (#7371)

It's not used anymore, and cleans up the build.
wpilibsuite · Nov 9, 2024 · 3cc541f · 3cc541f
1 parent 811b130
commit 3cc541f
Show file tree

Hide file tree

Showing 45 changed files with 0 additions and 342 deletions.
diff --git a/.gitignore b/.gitignore
@@ -255,6 +255,3 @@ bazel_auth.rc
 
 # ctest
 /Testing/
-
-# protobuf
-!wpiprotoplugin.jar
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -293,8 +293,6 @@ if(WITH_NTCORE)
     add_subdirectory(ntcore)
 endif()
 
-add_subdirectory(protoplugin)
-
 if(WITH_WPIMATH)
     if(WITH_JAVA)
         set(WPIUNITS_DEP_REPLACE ${WPIUNITS_DEP_REPLACE_IMPL})

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,6 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id 'com.diffplug.spotless' version '6.20.0' apply false
     id 'com.github.spotbugs' version '6.0.2' apply false
-    id 'com.google.protobuf' version '0.9.3' apply false
 }
 
 wpilibVersioning.buildServerMode = project.hasProperty('buildServer')

diff --git a/cmake/modules/WpiProtobuf.cmake b/cmake/modules/WpiProtobuf.cmake
diff --git a/protoplugin/CMakeLists.txt b/protoplugin/CMakeLists.txt
diff --git a/protoplugin/binary/wpiprotoplugin.bat.in b/protoplugin/binary/wpiprotoplugin.bat.in
diff --git a/protoplugin/binary/wpiprotoplugin.jar b/protoplugin/binary/wpiprotoplugin.jar
diff --git a/protoplugin/binary/wpiprotoplugin.sh.in b/protoplugin/binary/wpiprotoplugin.sh.in
diff --git a/protoplugin/build.gradle b/protoplugin/build.gradle
diff --git a/protoplugin/settings.gradle b/protoplugin/settings.gradle
diff --git a/protoplugin/src/main/java/org/wpilib/ProtoCDllGenerator.java b/protoplugin/src/main/java/org/wpilib/ProtoCDllGenerator.java
diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'maven-publish'
 apply plugin: 'java-library'
 apply plugin: 'jacoco'
-apply plugin: 'com.google.protobuf'
 
 def baseArtifactId = project.baseId
 def artifactGroupId = project.groupId
@@ -143,35 +142,3 @@ jacocoTestReport {
         html.required = true
     }
 }
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.21.12'
-    }
-    plugins {
-        wpilib {
-            path = rootProject.file("protoplugin/binary/wpiprotoplugin.jar")
-        }
-    }
-    generateProtoTasks {
-        all().configureEach { task ->
-            if (project.hasProperty('skipproto')) {
-                task.builtins {
-                    cpp {}
-                    remove java
-                }
-                return
-            }
-            task.inputs.file(rootProject.file("protoplugin/binary/wpiprotoplugin.jar"))
-            task.plugins {
-                wpilib {
-                    outputSubDir = 'cpp'
-                }
-            }
-            task.builtins {
-                cpp {}
-                remove java
-            }
-        }
-    }
-}
diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle
@@ -43,9 +43,6 @@ model {
                     it.buildable = false
                     return
                 }
-                it.tasks.withType(CppCompile) {
-                    it.dependsOn generateProto
-                }
                 if (project.hasProperty('extraSetup')) {
                     extraSetup(it)
                 }

diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
@@ -67,9 +67,6 @@ model {
                 if (!project.hasProperty('noWpiutil')) {
                     lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
                 }
-                it.tasks.withType(CppCompile) {
-                    it.dependsOn generateProto
-                }
                 if (project.hasProperty('splitSetup')) {
                     splitSetup(it)
                 }
@@ -223,9 +220,6 @@ model {
                         nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
                     }
                 }
-                it.tasks.withType(CppCompile) {
-                    it.dependsOn generateProto
-                }
                 if (project.hasProperty('exeSplitSetup')) {
                     exeSplitSetup(it)
                 }
@@ -279,9 +273,6 @@ model {
                     nativeUtils.useRequiredLibrary(it, 'ni_link_libraries', 'ni_runtime_libraries')
                 }
             }
-            it.tasks.withType(CppCompile) {
-                it.dependsOn generateProto
-            }
             if (project.hasProperty('exeSplitSetup')) {
                 exeSplitSetup(it)
             }

diff --git a/wpimath/build.gradle b/wpimath/build.gradle
@@ -43,10 +43,6 @@ cppHeadersZip {
     from('src/main/native/thirdparty/gcem/include') {
         into '/'
     }
-    from("$buildDir/generated/source/proto/main/cpp") {
-        into '/wpimath/protobuf'
-        include '*.h'
-    }
     from("src/generated/main/native/cpp/wpimath/protobuf") {
         into '/wpimath/protobuf'
         include '**/*.h'
@@ -56,8 +52,6 @@ cppHeadersZip {
     }
 }
 
-cppHeadersZip.dependsOn generateProto
-
 model {
     components {
         all {

diff --git a/wpimath/src/main/native/include/frc/controller/ArmFeedforward.h b/wpimath/src/main/native/include/frc/controller/ArmFeedforward.h
@@ -288,7 +288,5 @@ class WPILIB_DLLEXPORT ArmFeedforward {
 };
 }  // namespace frc
 
-#ifndef NO_PROTOBUF
 #include "frc/controller/proto/ArmFeedforwardProto.h"
-#endif
 #include "frc/controller/struct/ArmFeedforwardStruct.h"
diff --git a/wpimath/src/main/native/include/frc/controller/DifferentialDriveFeedforward.h b/wpimath/src/main/native/include/frc/controller/DifferentialDriveFeedforward.h
@@ -99,7 +99,5 @@ class WPILIB_DLLEXPORT DifferentialDriveFeedforward {
 };
 }  // namespace frc
 
-#ifndef NO_PROTOBUF
 #include "frc/controller/proto/DifferentialDriveFeedforwardProto.h"
-#endif
 #include "frc/controller/struct/DifferentialDriveFeedforwardStruct.h"
diff --git a/wpimath/src/main/native/include/frc/controller/DifferentialDriveWheelVoltages.h b/wpimath/src/main/native/include/frc/controller/DifferentialDriveWheelVoltages.h
@@ -21,7 +21,5 @@ struct DifferentialDriveWheelVoltages {
 
 }  // namespace frc
 
-#ifndef NO_PROTOBUF
 #include "frc/controller/proto/DifferentialDriveWheelVoltagesProto.h"
-#endif
 #include "frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h"
diff --git a/wpimath/src/main/native/include/frc/controller/ElevatorFeedforward.h b/wpimath/src/main/native/include/frc/controller/ElevatorFeedforward.h
@@ -262,7 +262,5 @@ class ElevatorFeedforward {
 };
 }  // namespace frc
 
-#ifndef NO_PROTOBUF
 #include "frc/controller/proto/ElevatorFeedforwardProto.h"
-#endif
 #include "frc/controller/struct/ElevatorFeedforwardStruct.h"