Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Choreo #440

Merged
merged 16 commits into from
Oct 15, 2024
Merged

Add Choreo #440

merged 16 commits into from
Oct 15, 2024

Conversation

spacey-sooty
Copy link
Contributor

Resolves #422

scripts/tools.gradle Outdated Show resolved Hide resolved
@spacey-sooty spacey-sooty force-pushed the add-choreo branch 3 times, most recently from e0e64a0 to 9ad0bad Compare October 14, 2024 14:25
Resolves wpilibsuite#422

Signed-off-by: Jade Turner <[email protected]>
@sciencewhiz
Copy link
Contributor

ChoreoLib Vendordep should also be downloaded and included like we do with the commands vendordep

Signed-off-by: Jade Turner <[email protected]>
@calcmogul
Copy link
Member

I assume that's done by adding more stuff to gradleriobase/build.gradle?

Signed-off-by: Jade Turner <[email protected]>
@spacey-sooty spacey-sooty marked this pull request as ready for review October 15, 2024 01:55
@spacey-sooty
Copy link
Contributor Author

waiting on Choreo release.

@sciencewhiz
Copy link
Contributor

I assume that's done by adding more stuff to gradleriobase/build.gradle?

def downloadNewCommands = tasks.register('downloadNewCommands', Download) {
src 'https://raw.githubusercontent.com/wpilibsuite/allwpilib/main/wpilibNewCommands/WPILibNewCommands.json'
def fileName = file(src.file).name
dest "$buildDir/downloads/$fileName"
overwrite false
}

zip.dependsOn downloadNewCommands
zip.dependsOn downloadReadTheDocs
zip.dependsOn downloadPythonAPI
zip.from(downloadNewCommands.get().outputFiles.first()) {
into '/vendordeps'
}

scripts/tools.gradle Show resolved Hide resolved
gradleriobase/build.gradle Outdated Show resolved Hide resolved
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
files/Choreo.vbs Outdated Show resolved Hide resolved
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
files/Choreo.vbs Outdated Show resolved Hide resolved
spacey-sooty and others added 2 commits October 15, 2024 11:41
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
Signed-off-by: Jade Turner <[email protected]>
@spacey-sooty
Copy link
Contributor Author

tested this locally it works

Copy link
Member

@calcmogul calcmogul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Linux installer properly installed the Choreo binaries, vendordep JSON, and maven artifacts on my machine.

@PeterJohnson PeterJohnson merged commit 778914a into wpilibsuite:main Oct 15, 2024
7 checks passed
@jwbonner
Copy link
Member

It looks like the launch scripts aren't copied to the installer archive, so the tools menu still doesn't work. That needs to be added to tools.gradle.

@spacey-sooty spacey-sooty deleted the add-choreo branch October 15, 2024 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bundle Choreo with installer
7 participants