Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Remove all references to Athena (#9019)

Browse Source
This commit is contained in:
Thad House
2026-06-23 06:20:34 -07:00
committed by GitHub
parent e3cbc5eb30
commit cc1c11c903
21 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmark/build.gradle
View File

@@ -321,14 +321,14 @@ model {
}
}
}
installAthena(Task) {
installSystemcore(Task) {
$.binaries.each {
if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'benchmarkCpp') {
dependsOn it.tasks.install
}
}
}
installAthenaStatic(Task) {
installSystemcoreStatic(Task) {
$.binaries.each {
if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'benchmarkCppStatic') {
dependsOn it.tasks.install

4
commandsv2/CommandsV2.json
View File

@@ -33,11 +33,9 @@
"skipInvalidPlatforms": true,
"binaryPlatforms": [
"linuxsystemcore",
"linuxathena",
"linuxarm32",
"linuxarm64",
"windowsx86-64",
"windowsx86",
"windowsarm64",
"linuxx86-64",
"osxuniversal"
]

2
cscore/build.gradle
View File

@@ -172,7 +172,7 @@ model {
components {
examplesMap.each { key, value ->
if (key == "usbviewer") {
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
if (!project.hasProperty('onlylinuxsystemcore')) {
"${key}"(NativeExecutableSpec) {
targetBuildTypes 'debug'
binaries.all {

2
fields/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
glass/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

4
hal/build.gradle
View File

@@ -70,10 +70,6 @@ ext {
sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java"
cppSourcesZip {
from('src/main/native/athena') {
into '/athena'
}
from('src/main/native/systemcore') {
into '/systemcore'
}

2
shared/java/javacommon.gradle
View File

@@ -84,7 +84,7 @@ test {
finalizedBy jacocoTestReport
}
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
if (project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
test.enabled = false
}

7
shared/plugins/setupBuild.gradle
View File

@@ -2,8 +2,7 @@ apply plugin: 'cpp'
apply plugin: 'org.wpilib.NativeUtils'
apply plugin: ExtraTasks
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
ext.skiplinuxathena = true
if (!project.hasProperty('onlylinuxsystemcore')) {
ext.skiplinuxsystemcore = true
apply from: "${rootDir}/shared/config.gradle"
@@ -58,7 +57,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsy
}
}
binaries.all {
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
if (!project.hasProperty('onlylinuxsystemcore')) {
project(':hal').addHalDependency(it, 'shared')
lib library: pluginName
if (project.hasProperty('includeNtCore')) {
@@ -82,7 +81,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsy
model {
tasks {
def c = $.components
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
if (!project.hasProperty('onlylinuxsystemcore')) {
project.tasks.create('runCpp', Exec) {
group = 'WPILib'
description = "Run the ${pluginName}Dev executable"

2
simulation/halsim_ds_socket/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
simulation/halsim_gui/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
simulation/halsim_ws_client/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
simulation/halsim_ws_core/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
simulation/halsim_ws_server/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
simulation/halsim_xrp/build.gradle
View File

@@ -1,4 +1,4 @@
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
thirdparty/imgui_suite/build.gradle vendored
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
tools/datalogtool/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
tools/outlineviewer/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
tools/processstarter/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
tools/sysid/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

2
wpigui/build.gradle
View File

@@ -1,6 +1,6 @@
import org.gradle.internal.os.OperatingSystem
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
if (project.hasProperty('onlylinuxsystemcore')) {
return;
}

4
wpilibjExamples/build.gradle
View File

@@ -226,7 +226,7 @@ model {
}
testTask.systemProperty 'java.library.path', filePath
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
if (project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
testTask.enabled = false
}
test.dependsOn(testTask)
@@ -270,7 +270,7 @@ model {
}
testTask.systemProperty 'java.library.path', filePath
if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
if (project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
testTask.enabled = false
}
test.dependsOn(testTask)