Skip to content
This repository has been archived by the owner on Sep 21, 2020. It is now read-only.

Commit

Permalink
Adds support for building separate armhf artifacts (#177)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ThadHouse authored and PeterJohnson committed Jan 4, 2017
1 parent 78995f5 commit 5df78c5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion ntcore.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
7 changes: 6 additions & 1 deletion wpiutil.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down

0 comments on commit 5df78c5

Please sign in to comment.