diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-01-24 12:59:17 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-01-24 13:16:19 -0800 |
| commit | 66ea145c4c92833e048844cd8852060d46f1a703 (patch) | |
| tree | daac1a5ea89bbb31943682e149842c3ee3f745fd /jni-plugin/src/main/scala/ch | |
| parent | 3f267949207aa4407064ab3553b4e410c413055a (diff) | |
| download | sbt-jni-0.4.0.tar.gz sbt-jni-0.4.0.tar.bz2 sbt-jni-0.4.0.zip | |
Add combinated native libraries keyv0.4.0
Diffstat (limited to 'jni-plugin/src/main/scala/ch')
| -rw-r--r-- | jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala index 6014086..1d874cc 100644 --- a/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala +++ b/jni-plugin/src/main/scala/ch/jodersky/sbt/jni/plugins/JniPackaging.scala @@ -39,6 +39,10 @@ object JniPackaging extends AutoPlugin { "Maps locally built, platform-dependant libraries." ) + val nativeLibraries = taskKey[Map[Platform, File]]( + "All native libraries, managed and unmanaged." + ) + } import autoImport._ import JniNative.autoImport._ @@ -83,9 +87,12 @@ object JniPackaging extends AutoPlugin { } }.value, + // managed native libraries take precedence + nativeLibraries := unmanagedNativeLibraries.value ++ unmanagedNativeLibraries.value, + resourceGenerators += Def.task { - val libraries: Seq[(Platform, File)] = (managedNativeLibraries.value ++ unmanagedNativeLibraries.value).toSeq + val libraries: Seq[(Platform, File)] = nativeLibraries.value.toSeq val resources: Seq[File] = for ((plat, file) <- libraries) yield { |