mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-02 02:51:42 +00:00
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:
committed by
Peter Johnson
parent
78995f5cca
commit
5df78c520c
@@ -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')) {
|
||||
|
||||
@@ -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')) {
|
||||
|
||||
Reference in New Issue
Block a user