From d0a6b17cae61226e768b6b23d001485d55f6029b Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Wed, 1 Jan 2025 18:56:27 -0800 Subject: [PATCH] Disable SmartDashboard and wpical on Linux arm64 --- .../gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java index 7b8b127c..af7f61ce 100644 --- a/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java +++ b/src/main/java/edu/wpi/first/gradlerio/wpi/dependencies/tools/WPIToolsPlugin.java @@ -25,7 +25,7 @@ public void apply(Project project) { Provider toolsFolder = project.provider(() -> frcHome.get().dir("tools")); String toolsClassifier = project.getExtensions().getByType(WPIExtension.class).getToolsClassifier(); - if (!toolsClassifier.equals("macarm64")) { + if (!toolsClassifier.equals("macarm64") && !toolsClassifier.equals("linuxarm64")) { tools.add(new WPITool(project, "SmartDashboard", wpi.getVersions().getSmartDashboardVersion(), "edu.wpi.first.tools", "SmartDashboard", true, toolsFolder)); } @@ -51,8 +51,10 @@ public void apply(Project project) { cppTools.add(new WPICppTool(project, "DataLogTool", wpi.getVersions().getDataLogToolVersion(), "edu.wpi.first.tools:DataLogTool", toolsFolder)); - cppTools.add(new WPICppTool(project, "wpical", wpi.getVersions().getwpicalToolVersion(), - "edu.wpi.first.tools:wpical", toolsFolder)); + if (!toolsClassifier.equals("linuxarm64")) { + cppTools.add(new WPICppTool(project, "wpical", wpi.getVersions().getwpicalToolVersion(), + "edu.wpi.first.tools:wpical", toolsFolder)); + } project.getTasks().register("InstallAllTools", task -> { task.setGroup("GradleRIO");