Adds support for building separate armhf artifacts (#177)

Currently if using a separate compiler prefix, it would still get published
to the arm classifier. This modifies so a classifier suffix can be used to
disambiguate arm from armhf.
This commit is contained in:
Thad House
2017-01-03 19:12:47 -08:00
committed by Peter Johnson
parent 78995f5cca
commit 5df78c520c
2 changed files with 12 additions and 2 deletions

View File

@@ -61,7 +61,12 @@ def ntcoreZipTask = { project ->
group = 'WPILib'
destinationDir = project.buildDir
baseName = 'ntcore'
classifier = "${project.buildPlatform}"
if (project.isArm && project.hasProperty('compilerPrefix')
&& project.hasProperty('armSuffix')) {
classifier = "${project.buildPlatform}${project.armSuffix}"
} else {
classifier = "${project.buildPlatform}"
}
duplicatesStrategy = 'exclude'
from(file('include')) {

View File

@@ -34,7 +34,12 @@ def wpiutilZipTask = { project ->
group = 'WPILib'
destinationDir = project.buildDir
baseName = 'wpiutil'
classifier = "${project.buildPlatform}"
if (project.isArm && project.hasProperty('compilerPrefix')
&& project.hasProperty('armSuffix')) {
classifier = "${project.buildPlatform}${project.armSuffix}"
} else {
classifier = "${project.buildPlatform}"
}
duplicatesStrategy = 'exclude'
from(file('wpiutil/include')) {