Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

HAND FIXES: Fixup gradle / cmake / styleguide

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 19:56:29 -05:00
committed by Peter Johnson
parent 105deaddb0
commit c89910b7c6
31 changed files with 95 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.styleguide
View File

@@ -43,20 +43,13 @@ includeOtherLibs {
^fmt/
^glass/
^gtest/
^hal/
^imgui
^implot
^mockdata/
^networktables/
^ntcore
^opencv2/
^support/
^units/
^unsupported/
^upb/
^vision/
^wpi/
^wpigui
^wpimath/
^wpinet/
}

10
CMakeLists.txt
View File

@@ -321,13 +321,13 @@ if(WITH_GUI)
add_subdirectory(thirdparty/imgui_suite)
add_subdirectory(wpigui)
add_subdirectory(glass)
add_subdirectory(outlineviewer)
add_subdirectory(sysid)
add_subdirectory(tools/outlineviewer)
add_subdirectory(tools/sysid)
if(WITH_WPICAL)
add_subdirectory(wpical)
add_subdirectory(tools/wpical)
endif()
if(LIBSSH_FOUND)
add_subdirectory(datalogtool)
add_subdirectory(tools/datalogtool)
endif()
endif()
@@ -349,7 +349,7 @@ if(WITH_WPILIB)
set(COMMANDSV3_DEP_REPLACE "find_dependency(commandsv3)")
set(WPILIBC_DEP_REPLACE "find_dependency(wpilibc)")
set(WPILIBJ_DEP_REPLACE "find_dependency(wpilibj)")
set(WPILIBNEWCOMMANDS_DEP_REPLACE "find_dependency(commandsv2)")
set(COMMAND_DEP_REPLACE "find_dependency(commandsv2)")
add_subdirectory(apriltag)
add_subdirectory(wpilibj)
add_subdirectory(wpilibc)

2
apriltag/build.gradle
View File

@@ -4,7 +4,7 @@ apply plugin: 'c'
ext {
nativeName = 'apriltag'
devMain = 'edu.wpi.first.apriltag.DevMain'
devMain = 'org.wpilib.vision.apriltag.DevMain'
useJava = true
useCpp = true
sharedCvConfigs = [

4
cameraserver/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
}
@@ -14,11 +15,8 @@ repoRootNameOverride {
includeOtherLibs {
^fmt/
^gtest/
^hal/
^networktables/
^opencv2/
^support/
^wpi/
}
includeGuardRoots {

7
commandsv2/.styleguide
View File

@@ -17,19 +17,12 @@ generatedFileExclude {
}
includeOtherLibs {
^cameraserver/
^cscore
^fmt/
^frc/
^gtest/
^hal/
^imgui
^mockdata/
^networktables/
^ntcore
^opencv2/
^support/
^units/
^vision/
^wpi/
}

6
cscore/.styleguide
View File

@@ -18,7 +18,7 @@ modifiableFileExclude {
}
licenseUpdateExclude {
src/main/native/cpp/default_init_allocator\.h$
src/main/native/cpp/default_init_allocator\.hpp$
}
includeGuardRoots {
@@ -41,7 +41,5 @@ includeOtherLibs {
^imgui
^support/
^tcpsockets/
^wpi/
^wpigui
^wpinet/
^wpi/net/
}

2
datalog/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
}
cppSrcFileInclude {
@@ -27,5 +28,4 @@ includeOtherLibs {
^fmt/
^gtest/
^upb/
^wpi/(?!datalog)
}

60
docs/build.gradle
View File

@@ -89,24 +89,24 @@ doxygen.sourceSets.main {
exclude 'apriltag_pose.h'
// LLVM
exclude 'wpi/Compiler.h'
exclude 'wpi/ErrorHandling.h'
exclude 'wpi/bit.h'
exclude 'wpi/raw_ostream.h'
exclude 'wpi/SmallVector.h'
exclude 'wpi/StringExtras.h'
exclude 'wpi/util/Compiler.hpp'
exclude 'wpi/util/ErrorHandling.hpp'
exclude 'wpi/util/bit.hpp'
exclude 'wpi/util/raw_ostream.hpp'
exclude 'wpi/util/SmallVector.hpp'
exclude 'wpi/util/StringExtras.hpp'
// libuv
exclude 'uv/**'
// json
exclude 'wpi/detail/**'
exclude 'wpi/util/detail/**'
// mpack
exclude 'wpi/mpack.h'
exclude 'wpi/util/mpack.h'
// units
exclude 'units/**'
exclude 'wpi/units/**'
}
exclude '*.pb.h'
@@ -152,29 +152,31 @@ task generateJavaDocs(type: Javadoc) {
options.addStringOption("tag", "pre:a:Pre-Condition")
options.addBooleanOption("Xdoclint/package:" +
// TODO: v Document these, then remove them from the list
"-edu.wpi.first.hal," +
"-edu.wpi.first.hal.simulation," +
"-org.wpilib.hardware.hal," +
"-org.wpilib.hardware.hal.simulation," +
// TODO: ^ Document these, then remove them from the list
"-edu.wpi.first.math.proto," +
"-edu.wpi.first.math.struct," +
"-edu.wpi.first.math.controller.proto," +
"-edu.wpi.first.math.controller.struct," +
"-edu.wpi.first.math.geometry.proto," +
"-edu.wpi.first.math.geometry.struct," +
"-edu.wpi.first.math.kinematics.proto," +
"-edu.wpi.first.math.kinematics.struct," +
"-edu.wpi.first.math.spline.proto," +
"-edu.wpi.first.math.spline.struct," +
"-edu.wpi.first.math.system.proto," +
"-edu.wpi.first.math.system.struct," +
"-edu.wpi.first.math.system.plant.proto," +
"-edu.wpi.first.math.system.plant.struct," +
"-edu.wpi.first.math.trajectory.proto," +
"-edu.wpi.first.math.trajectory.struct," +
"-org.wpilib.commands3.proto," +
"-org.wpilib.math.proto," +
"-org.wpilib.math.struct," +
"-org.wpilib.math.controller.proto," +
"-org.wpilib.math.controller.struct," +
"-org.wpilib.math.geometry.proto," +
"-org.wpilib.math.geometry.struct," +
"-org.wpilib.math.kinematics.proto," +
"-org.wpilib.math.kinematics.struct," +
"-org.wpilib.math.linalg.proto," +
"-org.wpilib.math.linalg.struct," +
"-org.wpilib.math.spline.proto," +
"-org.wpilib.math.spline.struct," +
"-org.wpilib.math.system.proto," +
"-org.wpilib.math.system.struct," +
"-org.wpilib.math.system.plant.proto," +
"-org.wpilib.math.system.plant.struct," +
"-org.wpilib.math.trajectory.proto," +
"-org.wpilib.math.trajectory.struct," +
"-org.wpilib.command3.proto," +
// The .measure package contains generated source files for which automatic javadoc
// generation is very difficult to do meaningfully.
"-edu.wpi.first.units.measure", true)
"-org.wpilib.units.measure", true)
options.addBooleanOption("Xdoclint:html,missing,reference,syntax", true)
options.addBooleanOption('html5', true)
options.linkSource(true)

16
glass/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -20,17 +21,12 @@ repoRootNameOverride {
includeOtherLibs {
^GLFW
^cscore
^fmt/
^fields/
^frc/
^imgui
portable-file-dialogs.h
^networktables/
^ntcore
^units
^upb/
^wpi/
^wpigui
^wpimath/
}
includeProject {
wpi/gui/portable-file-dialogs.h
wpi/util/expected
}

5
hal/.styleguide
View File

@@ -34,18 +34,13 @@ repoRootNameOverride {
}
includeOtherLibs {
^FRC_FPGA_ChipObject/
^FRC_NetworkCommunication/
^fmt/
^gtest/
^i2clib/
^llvm/
^networktables/
^ntcore
^opencv2/
^spilib/
^support/
^wpi/
}
includeProject {

2
hal/build.gradle
View File

@@ -9,7 +9,7 @@ ext {
nativeName = 'hal'
setBaseName = 'wpiHal'
devMain = 'edu.wpi.first.hal.DevMain'
devMain = 'org.wpilib.hardware.hal.DevMain'
generatedHeaders = "src/generated/main/native/include"
splitSetup = {
if (it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore) {

3
ntcore/.styleguide
View File

@@ -4,6 +4,7 @@ cHeaderFileInclude {
cppHeaderFileInclude {
(?<!_c)\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -35,6 +36,4 @@ includeOtherLibs {
^fmt/
^gtest/
^support/
^wpi/
^wpinet/
}

3
ntcoreffi/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
}
cppSrcFileInclude {
@@ -18,8 +19,6 @@ includeOtherLibs {
^fmt/
^gmock/
^gtest/
^networktables/
^wpi/
}
includeGuardRoots {

9
romiVendordep/.styleguide
View File

@@ -18,19 +18,10 @@ repoRootNameOverride {
}
includeOtherLibs {
^cameraserver/
^cscore
^fmt/
^frc/
^gtest/
^hal/
^imgui
^mockdata/
^networktables/
^ntcore
^opencv2/
^support/
^units/
^vision/
^wpi/
}

10
settings.gradle
View File

@@ -36,9 +36,9 @@ include 'wpiannotations'
include 'wpiunits'
include 'fields'
include 'glass'
include 'outlineviewer'
include 'datalogtool'
include 'sysid'
include 'tools:outlineviewer'
include 'tools:datalogtool'
include 'tools:sysid'
include 'simulation:halsim_ds_socket'
include 'simulation:halsim_gui'
include 'simulation:halsim_ws_core'
@@ -57,13 +57,13 @@ include 'docs'
include 'msvcruntime'
include 'ntcoreffi'
include 'apriltag'
include 'processstarter'
include 'tools:processstarter'
include 'epilogue-processor'
include 'epilogue-runtime'
include 'thirdparty:catch2'
include 'thirdparty:googletest'
include 'thirdparty:imgui_suite'
include 'wpical'
include 'tools:wpical'
include 'datalog'
buildCache {

2
styleguide/pmd-ruleset.xml
View File

@@ -15,7 +15,7 @@
<exclude-pattern>.*/*IntegrationTests.*</exclude-pattern>
<exclude-pattern>.*/*JNI.*</exclude-pattern>
<exclude-pattern>.*/math/proto.*</exclude-pattern>
<exclude-pattern>.*/commands3/proto.*</exclude-pattern>
<exclude-pattern>.*/command3/proto.*</exclude-pattern>
<rule ref="category/java/bestpractices.xml">
<exclude name="AccessorClassGeneration" />

5
tools/datalogtool/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -21,10 +22,6 @@ repoRootNameOverride {
includeOtherLibs {
^GLFW
^fmt/
^glass/
^imgui
^libssh/
^portable-file-dialog
^wpi/
^wpigui
}

9
tools/outlineviewer/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -21,15 +22,7 @@ repoRootNameOverride {
includeOtherLibs {
^GLFW
^fmt/
^frc/
^glass/
^gtest/
^imgui
^implot\.h$
^networktables/
^portable-file-dialogs\.h$
^ntcore
^units/
^wpi/
^wpigui
}

9
tools/sysid/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -21,15 +22,7 @@ repoRootNameOverride {
includeOtherLibs {
^GLFW
^fmt/
^frc/
^glass/
^gtest/
^imgui
^implot\.h$
^networktables/
^portable-file-dialogs\.h$
^ntcore
^units/
^wpi/
^wpigui
}

5
tools/wpical/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -24,13 +25,9 @@ includeOtherLibs {
^GLFW
^ceres/
^fmt/
^frc/
^gtest/
^imgui
^implot\.h$
^mrcal_wrapper\.h$
^opencv2\.h$
^portable-file-dialogs\.h$
^wpi/
^wpigui
}

2
tools/wpical/build.gradle
View File

@@ -120,7 +120,7 @@ nativeUtils.platformConfigs.each {
it.cppCompiler.args.add("-fpermissive")
}
}
def testResources = "\"$rootDir/wpical/src/main/native/assets\"".replace("\\", "/")
def testResources = "\"$rootDir/tools/wpical/src/main/native/assets\"".replace("\\", "/")
model {
components {
"${nativeName}"(NativeExecutableSpec) {

3
wpigui/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
}
cppSrcFileInclude {
@@ -8,7 +9,7 @@ cppSrcFileInclude {
generatedFileExclude {
wpigui/src/main/native/cpp/portable-file-dialogs\.cpp$
wpigui/src/main/native/include/portable-file-dialogs\.h$
wpigui/src/main/native/include/wpi/gui/portable-file-dialogs\.h$
}
repoRootNameOverride {

10
wpilibcExamples/.styleguide
View File

@@ -9,18 +9,8 @@ cppSrcFileInclude {
}
includeOtherLibs {
^cameraserver/
^cscore
^fmt/
^frc/
^frc2/
^gtest/
^hal/
^networktables/
^ntcore
^opencv2/
^support/
^units/
^vision/
^wpi/
}

6
wpilibj/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ if(WITH_JAVA)
configure_file(
src/generate/WPILibVersion.java.in
generated/main/java/org/wpilib/WPILibVersion.java
generated/main/java/org/wpilib/system/WPILibVersion.java
)
file(GLOB_RECURSE JAVA_SOURCES src/main/java/*.java src/generated/main/java/*.java)
@@ -29,7 +29,7 @@ if(WITH_JAVA)
add_jar(
wpilibj_jar
${JAVA_SOURCES}
${CMAKE_CURRENT_BINARY_DIR}/generated/main/java/org/wpilib/WPILibVersion.java
${CMAKE_CURRENT_BINARY_DIR}/generated/main/java/org/wpilib/system/WPILibVersion.java
INCLUDE_JARS
hal_jar
ntcore_jar
@@ -60,7 +60,7 @@ if(WITH_JAVA_SOURCE)
if(NOT WITH_JAVA)
configure_file(
src/generate/WPILibVersion.java.in
generated/main/java/org/wpilib/WPILibVersion.java
generated/main/java/org/wpilib/system/WPILibVersion.java
)
endif()
add_source_jar(

4
wpilibj/build.gradle
View File

@@ -12,7 +12,7 @@ ext {
apply from: "${rootDir}/shared/java/javacommon.gradle"
def wpilibVersionFileInput = file("src/generate/WPILibVersion.java.in")
def wpilibVersionFileOutput = file("$buildDir/generated/java/edu/wpi/first/wpilibj/util/WPILibVersion.java")
def wpilibVersionFileOutput = file("$buildDir/generated/java/org/wpilib/system/WPILibVersion.java")
task generateJavaVersion() {
description = 'Generates the wpilib version class'
@@ -155,7 +155,7 @@ model {
}
}
def oldWpilibVersionFile = file('src/main/java/edu/wpi/first/wpilibj/util/WPILibVersion.java')
def oldWpilibVersionFile = file('src/main/java/org/wpilib/system/WPILibVersion.java')
clean {
delete oldWpilibVersionFile

30
wpilibjExamples/build.gradle
View File

@@ -79,14 +79,14 @@ tasks.register('buildDesktopJava') {
apply from: 'publish.gradle'
ext {
templateDirectory = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/templates/")
templateFile = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/templates/templates.json")
exampleDirectory = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/examples/")
exampleFile = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/examples/examples.json")
commandDirectory = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/commands/")
commandFile = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/commands/commands.json")
snippetsDirectory = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/snippets/")
snippetsFile = new File("$projectDir/src/main/java/edu/wpi/first/wpilibj/snippets/snippets.json")
templateDirectory = new File("$projectDir/src/main/java/org/wpilib/templates/")
templateFile = new File("$projectDir/src/main/java/org/wpilib/templates/templates.json")
exampleDirectory = new File("$projectDir/src/main/java/org/wpilib/examples/")
exampleFile = new File("$projectDir/src/main/java/org/wpilib/examples/examples.json")
commandDirectory = new File("$projectDir/src/main/java/org/wpilib/commands/")
commandFile = new File("$projectDir/src/main/java/org/wpilib/commands/commands.json")
snippetsDirectory = new File("$projectDir/src/main/java/org/wpilib/snippets/")
snippetsFile = new File("$projectDir/src/main/java/org/wpilib/snippets/snippets.json")
}
apply plugin: 'cpp'
@@ -174,7 +174,7 @@ model {
new groovy.json.JsonSlurper().parseText(exampleFile.text).each { entry ->
project.tasks.create("run${entry.foldername}", JavaExec) { run ->
run.group = "run examples"
run.mainClass = "edu.wpi.first.wpilibj.examples." + entry.foldername + "." + entry.mainclass
run.mainClass = "org.wpilib.examples." + entry.foldername + "." + entry.mainclass
run.classpath = sourceSets.main.runtimeClasspath
run.dependsOn it.tasks.install
run.systemProperty 'java.library.path', filePath
@@ -188,15 +188,15 @@ model {
testTask.group = "verification"
testTask.useJUnitPlatform()
testTask.filter {
includeTestsMatching("edu.wpi.first.wpilibj.examples.${entry.foldername}.*")
includeTestsMatching("org.wpilib.examples.${entry.foldername}.*")
// armsimulation regularly fails on CI Win64Debug
if (project.hasProperty('ciDebugOnly')) {
excludeTestsMatching("edu.wpi.first.wpilibj.examples.armsimulation.*")
excludeTestsMatching("org.wpilib.examples.armsimulation.*")
}
setFailOnNoMatchingTests(false)
}
test.filter {
excludeTestsMatching("edu.wpi.first.wpilibj.examples.${entry.foldername}.*")
excludeTestsMatching("org.wpilib.examples.${entry.foldername}.*")
setFailOnNoMatchingTests(false)
}
testTask.testClassesDirs = sourceSets.test.output.classesDirs
@@ -219,7 +219,7 @@ model {
new groovy.json.JsonSlurper().parseText(snippetsFile.text).each { entry ->
project.tasks.create("runSnippet${entry.foldername}", JavaExec) { run ->
run.group = "run snippets"
run.mainClass = "edu.wpi.first.wpilibj.snippets." + entry.foldername + "." + entry.mainclass
run.mainClass = "org.wpilib.snippets." + entry.foldername + "." + entry.mainclass
run.classpath = sourceSets.main.runtimeClasspath
run.dependsOn it.tasks.install
run.systemProperty 'java.library.path', filePath
@@ -233,11 +233,11 @@ model {
testTask.group = "verification"
testTask.useJUnitPlatform()
testTask.filter {
includeTestsMatching("edu.wpi.first.wpilibj.snippets.${entry.foldername}.*")
includeTestsMatching("org.wpilib.snippets.${entry.foldername}.*")
setFailOnNoMatchingTests(false)
}
test.filter {
excludeTestsMatching("edu.wpi.first.wpilibj.snippets.${entry.foldername}.*")
excludeTestsMatching("org.wpilib.snippets.${entry.foldername}.*")
setFailOnNoMatchingTests(false)
}
testTask.testClassesDirs = sourceSets.test.output.classesDirs

8
wpimath/.styleguide
View File

@@ -14,9 +14,8 @@ modifiableFileExclude {
}
generatedFileExclude {
src/main/native/include/units/base\.h$
src/main/native/include/units/units\.h$
src/main/native/include/unsupported/
src/main/native/include/wpi/units/base\.hpp$
src/main/native/include/wpi/units/units\.hpp$
src/main/native/thirdparty/
src/test/native/cpp/UnitsTest\.cpp$
src/generated/main/java/org/wpilib/math/proto
@@ -43,9 +42,8 @@ includeOtherLibs {
^gtest/
^sleipnir/
^unsupported/
^wpi/
}
includeProject {
^units/
wpi/util/expected
}

2
wpimath/build.gradle
View File

@@ -5,7 +5,7 @@ ext {
groupId = 'edu.wpi.first.wpimath'
nativeName = 'wpimath'
devMain = 'edu.wpi.first.math.DevMain'
devMain = 'org.wpilib.math.DevMain'
splitSetup = {
it.sources {

4
wpinet/.styleguide
View File

@@ -1,5 +1,6 @@
cppHeaderFileInclude {
\.h$
\.hpp$
\.inc$
\.inl$
}
@@ -12,7 +13,7 @@ generatedFileExclude {
src/main/native/thirdparty/
src/main/native/cpp/http_parser\.cpp$
src/main/native/include/wpinet/http_parser\.h$
src/main/native/include/wpi/net/http_parser\.hpp$
src/main/native/resources/
src/main/native/linux/AvahiClient
@@ -37,5 +38,4 @@ includeOtherLibs {
^fmt/
^gmock/
^gtest/
^wpi/
}

8
wpiutil/.styleguide
View File

@@ -14,7 +14,7 @@ cppSrcFileInclude {
}
modifiableFileExclude {
src/main/native/include/wpi/MulticastServiceAnnouncer\.h$
src/main/native/include/wpi/util/MulticastServiceAnnouncer\.h$
}
generatedFileExclude {
@@ -23,8 +23,8 @@ generatedFileExclude {
src/main/python/
src/test/python/
src/main/native/include/wpi/fs\.h$
src/main/native/include/wpi/FastQueue\.h$
src/main/native/include/wpi/util/fs\.hpp$
src/main/native/include/wpi/util/FastQueue\.hpp$
src/main/native/cpp/fs\.cpp$
src/main/native/resources/
src/main/native/windows/StackWalker
@@ -37,7 +37,7 @@ generatedFileExclude {
licenseUpdateExclude {
src/main/native/cpp/Base64\.cpp$
src/main/native/cpp/sha1\.cpp$
src/main/native/include/wpi/sha1\.h$
src/main/native/include/wpi/util/sha1\.hpp$
}
repoRootNameOverride {

4
wpiutil/build.gradle
View File

@@ -4,13 +4,13 @@ apply plugin: 'c'
ext {
noWpiutil = true
skipJniSymbols = [
'Java_edu_wpi_first_util_CombinedRuntimeLoader_setDllDirectory'
'Java_org_wpilib_util_CombinedRuntimeLoader_setDllDirectory'
]
baseId = 'wpiutil'
groupId = 'edu.wpi.first.wpiutil'
nativeName = 'wpiutil'
devMain = 'edu.wpi.first.util.DevMain'
devMain = 'org.wpilib.util.DevMain'
def generateTask = createGenerateResourcesTask('main', 'WPI', 'wpi', project)
splitSetup = {