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

Update to new Native Utils (#1696)

Browse Source 
Also update to azure 2019 windows image
This commit is contained in:
Thad House
2019-06-28 14:09:10 -07:00
committed by Peter Johnson
parent 30e936837c
commit 3dfb01d45b
36 changed files with 408 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibcIntegrationTests/build.gradle
View File

@@ -32,8 +32,9 @@ model {
wpilibcIntegrationTests(NativeExecutableSpec) {
targetBuildTypes 'debug'
baseName = 'FRCUserProgram'
nativeUtils.useRequiredLibrary(it, 'googletest_static')
binaries.all { binary ->
if (binary.targetPlatform.architecture.name == 'athena') {
if (binary.targetPlatform.name == nativeUtils.wpi.platforms.roborio) {
binary.sources {
athenaCpp(CppSourceSet) {
source {
@@ -82,7 +83,7 @@ model {
copyWpilibCTestLibrariesToOutput(Copy) {
def task = it
$.binaries.each {
if (it in NativeExecutableBinarySpec && it.targetPlatform.architecture.name == 'athena') {
if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.roborio && it.buildable) {
def installTask = it.tasks.install
task.dependsOn installTask
task.from(installTask.executableFile) {
@@ -99,7 +100,7 @@ model {
}
// This is in a separate if statement because of what I would assume is a bug in grade.
// Will file an issue on their side.
if (!project.hasProperty('skipAthena')) {
if (!project.hasProperty('skiponlyathena')) {
build.dependsOn copyWpilibCTestLibrariesToOutput
}
}