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

Fixed jar task dependencies. The stripped version of the binary is now added to the jar, not the full debug version of the binary

Browse Source 
Change-Id: I8057dffd9e4ca28cca1fe8f0e95fa5fc536f2c9e
This commit is contained in:
Fredric Silberberg
2015-12-21 00:33:26 -05:00
parent 65e4eeeb7c
commit 4b0980fb86
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -144,7 +144,13 @@ def ntcoreZipTask = { project ->
project.build.dependsOn project.ntcoreZip
project.releaseSetup(project.ntcoreZip)
def releaseTasks = [project.ntcoreZip]
if (includeJava) {
releaseTasks.add(project.jar)
}
project.releaseSetup(releaseTasks)
project.tasks.whenTaskAdded { task ->
def name = task.name.toLowerCase()

4
toolchains/arm.gradle
View File

@@ -65,7 +65,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
cppCompiler.args '-g', '-O0'
}
ext.releaseSetup = { releaseTask ->
ext.releaseSetup = { releaseTasks ->
binaries.withType(SharedLibraryBinarySpec) { binary ->
if (!project.hasProperty('debug')) {
def library = binary.sharedLibraryFile.absolutePath
@@ -88,7 +88,7 @@ ext.releaseSetup = { releaseTask ->
}
}
}
releaseTask.dependsOn project.tasks.getByName("secondObjcopy${binary.name}")
releaseTasks.each { it.dependsOn project.tasks.getByName("secondObjcopy${binary.name}") }
}
}
}

4
toolchains/linux.gradle
View File

@@ -41,7 +41,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
cppCompiler.args '-g', '-O0'
}
ext.releaseSetup = { releaseTask ->
ext.releaseSetup = { releaseTasks ->
binaries.withType(SharedLibraryBinarySpec) { binary ->
if (!project.hasProperty('debug')) {
def library = binary.sharedLibraryFile.absolutePath
@@ -64,7 +64,7 @@ ext.releaseSetup = { releaseTask ->
}
}
}
releaseTask.dependsOn project.tasks.getByName("secondObjcopy${binary.name}")
releaseTasks.each { it.dependsOn project.tasks.getByName("secondObjcopy${binary.name}") }
}
}
}

4
toolchains/mac.gradle
View File

@@ -30,7 +30,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
cppCompiler.args '-g', '-O0'
}
ext.releaseSetup = { releaseTask ->
ext.releaseSetup = { releaseTasks ->
binaries.withType(SharedLibraryBinarySpec) { binary ->
if (!project.hasProperty('debug')) {
def library = binary.sharedLibraryFile.absolutePath
@@ -48,7 +48,7 @@ ext.releaseSetup = { releaseTask ->
}
}
}
releaseTask.dependsOn project.tasks.getByName("strip${binary.name}")
releaseTasks.each { it.dependsOn project.tasks.getByName("strip${binary.name}")
}
}
}