Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove generated google protobuf support #7371

Merged
merged 2 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,3 @@ bazel_auth.rc

# ctest
/Testing/

# protobuf
!wpiprotoplugin.jar
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
92 changes: 0 additions & 92 deletions cmake/modules/WpiProtobuf.cmake

This file was deleted.

20 changes: 0 additions & 20 deletions protoplugin/CMakeLists.txt

This file was deleted.

2 changes: 0 additions & 2 deletions protoplugin/binary/wpiprotoplugin.bat.in

This file was deleted.

Binary file removed protoplugin/binary/wpiprotoplugin.jar
Binary file not shown.
2 changes: 0 additions & 2 deletions protoplugin/binary/wpiprotoplugin.sh.in

This file was deleted.

33 changes: 0 additions & 33 deletions protoplugin/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion protoplugin/settings.gradle

This file was deleted.

76 changes: 0 additions & 76 deletions protoplugin/src/main/java/org/wpilib/ProtoCDllGenerator.java

This file was deleted.

33 changes: 0 additions & 33 deletions shared/java/javacommon.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
}
}
}
}
3 changes: 0 additions & 3 deletions shared/javacpp/setupBuild.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ model {
it.buildable = false
return
}
it.tasks.withType(CppCompile) {
it.dependsOn generateProto
}
if (project.hasProperty('extraSetup')) {
extraSetup(it)
}
Expand Down
9 changes: 0 additions & 9 deletions shared/jni/setupBuild.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 0 additions & 6 deletions wpimath/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -56,8 +52,6 @@ cppHeadersZip {
}
}

cppHeadersZip.dependsOn generateProto

model {
components {
all {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,5 @@ class WPILIB_DLLEXPORT ArmFeedforward {
};
} // namespace frc

#ifndef NO_PROTOBUF
ThadHouse marked this conversation as resolved.
Show resolved Hide resolved
#include "frc/controller/proto/ArmFeedforwardProto.h"
#endif
#include "frc/controller/struct/ArmFeedforwardStruct.h"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ struct DifferentialDriveWheelVoltages {

} // namespace frc

#ifndef NO_PROTOBUF
#include "frc/controller/proto/DifferentialDriveWheelVoltagesProto.h"
#endif
#include "frc/controller/struct/DifferentialDriveWheelVoltagesStruct.h"
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,5 @@ class ElevatorFeedforward {
};
} // namespace frc

#ifndef NO_PROTOBUF
#include "frc/controller/proto/ElevatorFeedforwardProto.h"
#endif
#include "frc/controller/struct/ElevatorFeedforwardStruct.h"
Loading
Loading