From 2e99e0c6dea98194de06eeb3be180b9a30627432 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sat, 14 Dec 2024 11:09:41 -0800 Subject: [PATCH] Synchronize projects build.gradle with vscode (#629) --- src/main/resources/export/cpp/build.gradle | 11 +---------- src/main/resources/export/java/build.gradle | 7 ++++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/resources/export/cpp/build.gradle b/src/main/resources/export/cpp/build.gradle index c768b722..49bbca4f 100644 --- a/src/main/resources/export/cpp/build.gradle +++ b/src/main/resources/export/cpp/build.gradle @@ -5,7 +5,7 @@ plugins { } // Define my targets (RoboRIO) and artifacts (deployable files) -// This is added by GradleRIO's backing project DeployTools. +// This is added by GradleRIO's backing project DeployUtils. deploy { targets { roborio(getTargetTypeClass('RoboRIO')) { @@ -35,12 +35,6 @@ deploy { def deployArtifact = deploy.targets.roborio.artifacts.frcCpp -// Set this to true to include the src folder in the include directories passed -// to the compiler. Some eclipse project imports depend on this behavior. -// We recommend leaving this disabled if possible. Note for eclipse project -// imports this is enabled by default. For new projects, its disabled -def includeSrcInIncludeRoot = false - #@autogenerated_code("desktop", "") #parse("${exporter_path}build-desktop.gradle") #end @@ -68,9 +62,6 @@ model { } exportedHeaders { srcDir 'src/main/include' - if (includeSrcInIncludeRoot) { - srcDir 'src/main/cpp' - } } } diff --git a/src/main/resources/export/java/build.gradle b/src/main/resources/export/java/build.gradle index 65dec004..5a229f8e 100644 --- a/src/main/resources/export/java/build.gradle +++ b/src/main/resources/export/java/build.gradle @@ -1,5 +1,3 @@ -import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO - plugins { id "java" id "edu.wpi.first.GradleRIO" version "${wpilib_version}" @@ -13,7 +11,7 @@ java { def ROBOT_MAIN_CLASS = "${package}.Main" // Define my targets (RoboRIO) and artifacts (deployable files) -// This is added by GradleRIO's backing project DeployTools. +// This is added by GradleRIO's backing project DeployUtils. deploy { targets { roborio(getTargetTypeClass('RoboRIO')) { @@ -35,6 +33,8 @@ deploy { frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' + deleteOldFiles = false // Change to true to delete files on roboRIO that no + // longer exist in deploy directory of this project } } } @@ -80,6 +80,7 @@ test { systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' } +// Simulation configuration (e.g. environment variables). wpi.sim.addGui().defaultEnabled = true wpi.sim.addDriverstation()