Remove remaining Choreo references

wpilibsuite · Dec 14, 2024 · 5b70690 · 5b70690
1 parent a62c1f1
commit 5b70690
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/WPILibInstaller-Avalonia/ViewModels/InstallPageViewModel.cs b/WPILibInstaller-Avalonia/ViewModels/InstallPageViewModel.cs
@@ -846,7 +846,6 @@ private async Task RunShortcutCreator(CancellationToken token)
             shortcutData.DesktopShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "tools", "roboRIOTeamNumberSetter.exe"), $"{frcYear} WPILib Tools/roboRIO Team Number Setter {frcYear}", $"roboRIO Team Number Setter {frcYear}", ""));
             shortcutData.DesktopShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "tools", "DataLogTool.exe"), $"{frcYear} WPILib Tools/Data Log Tool {frcYear}", $"Data Log Tool {frcYear}", ""));
             shortcutData.DesktopShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "advantagescope", "AdvantageScope (WPILib).exe"), $"{frcYear} WPILib Tools/AdvantageScope (WPILib) {frcYear}", $"AdvantageScope (WPILib) {frcYear}", ""));
-            shortcutData.DesktopShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "choreo", "choreo.exe"), $"{frcYear} WPILib Tools/Choreo (WPILib) {frcYear}", $"Choreo (WPILib) {frcYear}", ""));
             shortcutData.DesktopShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "elastic", "elastic_dashboard.exe"), $"{frcYear} WPILib Tools/Elastic (WPILib) {frcYear}", $"Elastic (WPILib) {frcYear}", ""));
 
             shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "tools", "Glass.exe"), $"Programs/{frcYear} WPILib Tools/Glass {frcYear}", $"Glass {frcYear}", ""));
@@ -859,7 +858,6 @@ private async Task RunShortcutCreator(CancellationToken token)
             shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "tools", "roboRIOTeamNumberSetter.exe"), $"Programs/{frcYear} WPILib Tools/roboRIO Team Number Setter {frcYear}", $"roboRIO Team Number Setter {frcYear}", ""));
             shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "tools", "DataLogTool.exe"), $"Programs/{frcYear} WPILib Tools/Data Log Tool {frcYear}", $"Data Log Tool {frcYear}", ""));
             shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "advantagescope", "AdvantageScope (WPILib).exe"), $"Programs/{frcYear} WPILib Tools/AdvantageScope (WPILib) {frcYear}", $"AdvantageScope (WPILib) {frcYear}", ""));
-            shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "choreo", "choreo.exe"), $"Programs/{frcYear} WPILib Tools/Choreo (WPILib) {frcYear}", $"Choreo (WPILib) {frcYear}", ""));
             shortcutData.StartMenuShortcuts.Add(new ShortcutInfo(Path.Join(frcHomePath, "elastic", "elastic_dashboard.exe"), $"Programs/{frcYear} WPILib Tools/Elastic (WPILib) {frcYear}", $"Elastic (WPILib) {frcYear}", ""));
 
             if (toInstallProvider.Model.InstallEverything)

diff --git a/scripts/tools.gradle b/scripts/tools.gradle
@@ -8,9 +8,6 @@ def scriptBaseCppUnixFile = file("files/ScriptBaseCpp.sh")
 def advantageScopeScriptFile = file("files/AdvantageScope.vbs")
 def advantageScopeScriptUnixFile = file("files/AdvantageScope.sh")
 
-def choreoScriptFile = file("files/Choreo.vbs")
-def choreoScriptUnixFile = file("files/Choreo.sh")
-
 def elasticScriptFile = file("files/Elastic.vbs")
 def elasticScriptUnixFile = file("files/Elastic.sh")
 
@@ -113,10 +110,6 @@ ext.toolsSetup = { AbstractArchiveTask zip->
       into '/tools'
     }
 
-    zip.from (choreoScriptFile) {
-      into '/tools'
-    }
-
     zip.from (elasticScriptFile) {
       into '/tools'
     }
@@ -136,11 +129,6 @@ ext.toolsSetup = { AbstractArchiveTask zip->
       fileMode 0755
     }
 
-    zip.from (choreoScriptUnixFile) {
-      into '/tools'
-      fileMode 0755
-    }
-
     zip.from (elasticScriptUnixFile) {
       into '/tools'
       fileMode 0755