Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +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

8
shared/plugins/setupBuild.gradle
View File

@@ -10,7 +10,7 @@ ext {
apply from: "${rootDir}/shared/nilibraries.gradle"
if (!project.hasProperty('onlyAthena')) {
if (!project.hasProperty('onlylinuxathena')) {
ext.skipAthena = true
apply from: "${rootDir}/shared/config.gradle"
@@ -57,7 +57,7 @@ if (!project.hasProperty('onlyAthena')) {
}
}
binaries.all {
if (!project.hasProperty('onlyAthena') && !project.hasProperty('onlyRaspbian')) {
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxraspbian')) {
project(':hal').addHalDependency(it, 'shared')
lib library: pluginName
if (project.hasProperty('includeNtCore')) {
@@ -78,7 +78,7 @@ if (!project.hasProperty('onlyAthena')) {
model {
tasks {
def c = $.components
if (!project.hasProperty('onlyAthena') && !project.hasProperty('onlyRaspbian')) {
if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxraspbian')) {
project.tasks.create('runCpp', Exec) {
group = 'WPILib'
description = "Run the ${pluginName}Dev executable"
@@ -88,7 +88,7 @@ model {
if (it in NativeExecutableSpec && it.name == "${pluginName}Dev") {
it.binaries.each {
if (!found) {
def arch = it.targetPlatform.architecture.name
def arch = it.targetPlatform.name
if (arch == systemArch) {
dependsOn it.tasks.install
commandLine it.tasks.install.runScriptFile.get().asFile.toString()