mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-29 02:21:44 +00:00
Change wpilibcZip to use "lib" instead of "libs" to match where eclipse plugins expect libraries
Change-Id: I597c43d773507037cc7677fe4e1952a640543c81
This commit is contained in:
@@ -134,7 +134,7 @@ task wpilibcZip(type: Zip) {
|
||||
}
|
||||
}
|
||||
from(spec.staticLibraryFile) {
|
||||
into 'libs'
|
||||
into 'lib'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ task wpilibcZip(type: Zip) {
|
||||
}
|
||||
}
|
||||
from(spec.staticLibraryFile) {
|
||||
into 'libs'
|
||||
into 'lib'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,12 +162,12 @@ task wpilibcZip(type: Zip) {
|
||||
}
|
||||
}
|
||||
from(spec.staticLibraryFile) {
|
||||
into 'libs'
|
||||
into 'lib'
|
||||
}
|
||||
}
|
||||
hal.binaries.withType(SharedLibraryBinarySpec) { spec ->
|
||||
from(spec.sharedLibraryFile) {
|
||||
into 'libs'
|
||||
into 'lib'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,7 +176,7 @@ task wpilibcZip(type: Zip) {
|
||||
|
||||
// Finally, include all of the shared library objects from the ni directory
|
||||
from(project.file('../ni-libraries')) {
|
||||
into 'libs'
|
||||
into 'lib'
|
||||
exclude 'genlinks'
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user