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

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